diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c197f0340239..258c85f9dde8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.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/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index c00dc91bae8f..3018b6b99448 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.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/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index f1535526c2a7..2735534b0bc9 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.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/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md index 1ddcd983f31b..a76741fa8e6a 100644 --- a/.github/ISSUE_TEMPLATE/packaging_request.md +++ b/.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/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3d4bb049991f..5f21df834d56 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,7 +26,6 @@ For new packages please briefly describe the package or provide a link to its ho - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). -Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. +Documentation in nixpkgs is transitioning to a markdown-centric workflow. In the past release notes required a translation step to convert from markdown to a compatible docbook document, but this is no longer necessary. Steps for updating 23.05 Release notes: 1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes -2. Run `./nixos/doc/manual/md-to-db.sh` to render `nixos/doc/manual/from_md/release-notes/rl-2305.section.xml` -3. Include changes to `rl-2305.section.md` and `rl-2305.section.xml` in the same commit. +2. Commit changes to `rl-2305.section.md`. ## Reviewing contributions diff --git a/doc/Makefile b/doc/Makefile index 1e54aef9bd12..ee98a3ee9213 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' PANDOC ?= pandoc pandoc_media_dir = media -# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh). +# NOTE: Keep in sync with conversion script (/maintainers/scripts/db-to-md.sh). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute # Not needed: diff --git a/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua b/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua deleted file mode 100644 index 8f4de40ce5f8..000000000000 --- a/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua +++ /dev/null @@ -1,11 +0,0 @@ ---[[ -Converts some HTML elements commonly used in Markdown to corresponding DocBook elements. -]] - -function RawInline(elem) - if elem.format == 'html' and elem.text == '' then - return pandoc.RawInline('docbook', '') - elseif elem.format == 'html' and elem.text == '' then - return pandoc.RawInline('docbook', '') - end -end diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 773eb3028ddb..551df86a58f4 100644 --- a/doc/builders/fetchers.chapter.md +++ b/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/doc/builders/images.xml b/doc/builders/images.xml index 7d06130e3eca..a4661ab5a7af 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -11,4 +11,5 @@ + diff --git a/doc/builders/images/binarycache.section.md b/doc/builders/images/binarycache.section.md new file mode 100644 index 000000000000..fe2772f33b4b --- /dev/null +++ b/doc/builders/images/binarycache.section.md @@ -0,0 +1,49 @@ +# pkgs.mkBinaryCache {#sec-pkgs-binary-cache} + +`pkgs.mkBinaryCache` is a function for creating Nix flat-file binary caches. Such a cache exists as a directory on disk, and can be used as a Nix substituter by passing `--substituter file:///path/to/cache` to Nix commands. + +Nix packages are most commonly shared between machines using [HTTP, SSH, or S3](https://nixos.org/manual/nix/stable/package-management/sharing-packages.html), but a flat-file binary cache can still be useful in some situations. For example, you can copy it directly to another machine, or make it available on a network file system. It can also be a convenient way to make some Nix packages available inside a container via bind-mounting. + +Note that this function is meant for advanced use-cases. The more idiomatic way to work with flat-file binary caches is via the [nix-copy-closure](https://nixos.org/manual/nix/stable/command-ref/nix-copy-closure.html) command. You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your containerization needs. + +## Example + +The following derivation will construct a flat-file binary cache containing the closure of `hello`. + +```nix +mkBinaryCache { + rootPaths = [hello]; +} +``` + +- `rootPaths` specifies a list of root derivations. The transitive closure of these derivations' outputs will be copied into the cache. + +Here's an example of building and using the cache. + +Build the cache on one machine, `host1`: + +```shellSession +nix-build -E 'with import {}; mkBinaryCache { rootPaths = [hello]; }' +``` + +```shellSession +/nix/store/cc0562q828rnjqjyfj23d5q162gb424g-binary-cache +``` + +Copy the resulting directory to the other machine, `host2`: + +```shellSession +scp result host2:/tmp/hello-cache +``` + +Substitute the derivation using the flat-file binary cache on the other machine, `host2`: +```shellSession +nix-build -A hello '' \ + --option require-sigs false \ + --option trusted-substituters file:///tmp/hello-cache \ + --option substituters file:///tmp/hello-cache +``` + +```shellSession +/nix/store/gl5a41azbpsadfkfmbilh9yk40dh5dl0-hello-2.12.1 +``` diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index f6a0970165f5..2530b14a2f7b 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/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/doc/default.nix b/doc/default.nix index 1d5fa4811a36..ac405c379038 100644 --- a/doc/default.nix +++ b/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/doc/doc-support/default.nix b/doc/doc-support/default.nix index e9cb96e37fdd..bea3e12a70b3 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -75,7 +75,7 @@ in pkgs.runCommand "doc-support" {} ln -s ${epub-xsl} ./epub.xsl ln -s ${xhtml-xsl} ./xhtml.xsl - ln -s ${../../nixos/doc/xmlformat.conf} ./xmlformat.conf + ln -s ${./xmlformat.conf} ./xmlformat.conf ln -s ${pkgs.documentation-highlighter} ./highlightjs echo -n "${version}" > ./version diff --git a/nixos/doc/xmlformat.conf b/doc/doc-support/xmlformat.conf similarity index 100% rename from nixos/doc/xmlformat.conf rename to doc/doc-support/xmlformat.conf diff --git a/doc/hooks/breakpoint.section.md b/doc/hooks/breakpoint.section.md index 41e50653e91d..9600e06b7934 100644 --- a/doc/hooks/breakpoint.section.md +++ b/doc/hooks/breakpoint.section.md @@ -10,9 +10,7 @@ nativeBuildInputs = [ breakpointHook ]; When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. ::: {.note} -::: {.title} Caution with remote builds -::: This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. ::: diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 6b3a369c291f..707da43e9dd7 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -171,6 +171,7 @@ let inherit src version; # nix will complain and tell you the right value to replace this with hash = lib.fakeHash; + mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test". # if you have build time environment variables add them here MY_ENV_VAR="my_value"; }; diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index f0b302bbc356..c6d85a240a90 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -137,7 +137,12 @@ set the default version to a version older than the newest on Hackage. We do this to get them or their reverse dependencies to compile in our package set. 4. For all packages, for which the newest Hackage version is not the default version, there will also be a `haskellPackages.foo_x_y_z` package with the -newest version. +newest version. The `x_y_z` part encodes the version with dots replaced by +underscores. When the newest version changes by a new release to Hackage the +old package will disappear under that name and be replaced by a newer one under +the name with the new version. The package name including the version will +also disappear when the default version e.g. from Stackage catches up with the +newest version from Hackage. 5. For some packages, we also manually add other `haskellPackages.foo_x_y_z` versions, if they are required for a certain build. @@ -161,12 +166,14 @@ given in the `.cabal` file of your package and all its dependencies. The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing. It will simply take as input packages with names off the desired dependencies -and just check whether they fulfill the version bounds and (by default, see -`jailbreak`) fail if they don’t. +and just check whether they fulfill the version bounds and fail if they don’t +(by default, see `jailbreak` to circumvent this). -The package resolution is done by the `haskellPackages.callPackage` function -which will, e.g., use `haskellPackages.aeson` for a package input of name -`aeson`. +The `haskellPackages.callPackage` function does the package resolution. +It will, e.g., use `haskellPackages.aeson`which has the default version as +described above for a package input of name `aeson`. (More general: +`.callPackage f` will call `f` with named inputs provided from the +package set ``.) While this is the default behavior, it is possible to override the dependencies for a specific package, see [`override` and `overrideScope`](#haskell-overriding-haskell-packages). @@ -195,7 +202,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 +545,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/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 3774924c0be4..f089b99a0451 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -38,6 +38,7 @@ + diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index ee0a471be3e5..fb6fee997d6f 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/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.pkgConfigModules` 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/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md new file mode 100644 index 000000000000..1cc452cc9b9b --- /dev/null +++ b/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/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a12d68c0934f..1488a09982ad 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -95,6 +95,27 @@ installPhase() { genericBuild ``` +### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell} + +To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use + +```bash +nix-shell '' -A some_package +eval ${unpackPhase:-unpackPhase} +cd $sourceRoot +eval ${patchPhase:-patchPhase} +eval ${configurePhase:-configurePhase} +eval ${buildPhase:-buildPhase} +``` + +To modify a [phase](#sec-stdenv-phases), first print it with + +```bash +type buildPhase +``` + +then change it in a text editor, and paste it back to the terminal. + ## Tools provided by `stdenv` {#sec-tools-of-stdenv} The standard environment provides the following packages: @@ -116,6 +137,82 @@ On Linux, `stdenv` also includes the `patchelf` utility. ## Specifying dependencies {#ssec-stdenv-dependencies} +Build systems often require more dependencies than just what `stdenv` provides. This section describes attributes accepted by `stdenv.mkDerivation` that can be used to make these dependencies available to the build system. + +### Overview {#ssec-stdenv-dependencies-overview} + +A full reference of the different kinds of dependencies is provided in [](#ssec-stdenv-dependencies-reference), but here is an overview of the most common ones. +It should cover most use cases. + +Add dependencies to `nativeBuildInputs` if they are executed during the build: +- those which are needed on `$PATH` during the build, for example `cmake` and `pkg-config` +- [setup hooks](#ssec-setup-hooks), for example [`makeWrapper`](#fun-makeWrapper) +- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for build scripts (with the `--build` flag), which can be the case for e.g. `perl` + +Add dependencies to `buildInputs` if they will end up copied or linked into the final output or otherwise used at runtime: +- libraries used by compilers, for example `zlib`, +- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for scripts which are installed, which can be the case for e.g. `perl` + +::: {.note} +These criteria are independent. + +For example, software using Wayland usually needs the `wayland` library at runtime, so `wayland` should be added to `buildInputs`. +But it also executes the `wayland-scanner` program as part of the build to generate code, so `wayland` should also be added to `nativeBuildInputs`. +::: + +Dependencies needed only to run tests are similarly classified between native (executed during build) and non-native (executed at runtime): +- `nativeCheckInputs` for test tools needed on `$PATH` (such as `ctest`) and [setup hooks](#ssec-setup-hooks) (for example [`pytestCheckHook`](#python)) +- `checkInputs` for libraries linked into test executables (for example the `qcheck` OCaml package) + +These dependencies are only injected when [`doCheck`](#var-stdenv-doCheck) is set to `true`. + +#### Example {#ssec-stdenv-dependencies-overview-example} + +Consider for example this simplified derivation for `solo5`, a sandboxing tool: +```nix +stdenv.mkDerivation rec { + pname = "solo5"; + version = "0.7.5"; + + src = fetchurl { + url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; + sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ libseccomp ]; + + postInstall = '' + substituteInPlace $out/bin/solo5-virtio-mkimage \ + --replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \ + --replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \ + --replace "cp " "cp --no-preserve=mode " + + wrapProgram $out/bin/solo5-virtio-mkimage \ + --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + ''; + + doCheck = true; + nativeCheckInputs = [ util-linux qemu ]; + checkPhase = '' [elided] ''; +} +``` + +- `makeWrapper` is a setup hook, i.e., a shell script sourced by the generic builder of `stdenv`. + It is thus executed during the build and must be added to `nativeBuildInputs`. +- `pkg-config` is a build tool which the configure script of `solo5` expects to be on `$PATH` during the build: + therefore, it must be added to `nativeBuildInputs`. +- `libseccomp` is a library linked into `$out/bin/solo5-elftool`. + As it is used at runtime, it must be added to `buildInputs`. +- Tests need `qemu` and `getopt` (from `util-linux`) on `$PATH`, these must be added to `nativeCheckInputs`. +- Some dependencies are injected directly in the shell code of phases: `syslinux`, `dosfstools`, `mtools`, and `parted`. +In this specific case, they will end up in the output of the derivation (`$out` here). +As Nix marks dependencies whose absolute path is present in the output as runtime dependencies, adding them to `buildInputs` is not required. + +For more complex cases, like libraries linked into an executable which is then executed as part of the build system, see [](#ssec-stdenv-dependencies-reference). + +### Reference {#ssec-stdenv-dependencies-reference} + As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See [](#ssec-setup-hooks) for details. Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see [](#chap-cross) for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case. @@ -187,21 +284,21 @@ Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. -### Variables specifying dependencies {#variables-specifying-dependencies} +#### Variables specifying dependencies {#variables-specifying-dependencies} -#### `depsBuildBuild` {#var-stdenv-depsBuildBuild} +##### `depsBuildBuild` {#var-stdenv-depsBuildBuild} A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs} +##### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs} A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity. Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `depsBuildTarget` {#var-stdenv-depsBuildTarget} +##### `depsBuildTarget` {#var-stdenv-depsBuildTarget} A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional. @@ -209,41 +306,41 @@ This is a somewhat confusing concept to wrap one’s head around, and for good r Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `depsHostHost` {#var-stdenv-depsHostHost} +##### `depsHostHost` {#var-stdenv-depsHostHost} A list of dependencies whose host and target platforms match the new derivation’s host platform. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose. -#### `buildInputs` {#var-stdenv-buildInputs} +##### `buildInputs` {#var-stdenv-buildInputs} A list of dependencies whose host platform and target platform match the new derivation’s. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`. These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker. -#### `depsTargetTarget` {#var-stdenv-depsTargetTarget} +##### `depsTargetTarget` {#var-stdenv-depsTargetTarget} A list of dependencies whose host platform matches the new derivation’s target platform. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed. -#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated} +##### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated} The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be used, but it is included for consistency \[see below for the others\]. -#### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} +##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets. -#### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} +##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} The propagated equivalent of `depsBuildTarget`. This is prefixed for the same reason of alerting potential users. -#### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated} +##### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated} The propagated equivalent of `depsHostHost`. -#### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs} +##### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs} The propagated equivalent of `buildInputs`. This would be called `depsHostTargetPropagated` but for historical continuity. -#### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated} +##### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated} The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users. @@ -626,7 +723,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 +743,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/lib/default.nix b/lib/default.nix index b1441c728104..dc4df9575418 100644 --- a/lib/default.nix +++ b/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/lib/licenses.nix b/lib/licenses.nix index f22d1401410b..0c4d9d8bc9e1 100644 --- a/lib/licenses.nix +++ b/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/lib/lists.nix b/lib/lists.nix index 9f69485b4086..2186cd4a79f6 100644 --- a/lib/lists.nix +++ b/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/lib/options.nix b/lib/options.nix index d14d209a8347..5e8f4ca4bb95 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -36,6 +36,9 @@ let inherit (lib.types) mkOptionType ; + prioritySuggestion = '' + Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions. + ''; in rec { @@ -184,7 +187,7 @@ rec { if length defs == 1 then (head defs).value else assert length defs > 1; - throw "The option `${showOption loc}' is defined multiple times.\n${message}\nDefinition values:${showDefs defs}"; + throw "The option `${showOption loc}' is defined multiple times while it's expected to be unique.\n${message}\nDefinition values:${showDefs defs}\n${prioritySuggestion}"; /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: @@ -195,7 +198,7 @@ rec { else if length defs == 1 then (head defs).value else (foldl' (first: def: if def.value != first.value then - throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" + throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}\n${prioritySuggestion}" else first) (head defs) (tail defs)).value; diff --git a/lib/path/default.nix b/lib/path/default.nix index 96a9244407bf..075e2fc0d137 100644 --- a/lib/path/default.nix +++ b/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/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index eccf3b7b1c33..a1a45173a909 100644 --- a/lib/path/tests/unit.nix +++ b/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/lib/systems/architectures.nix b/lib/systems/architectures.nix index 94127fa90b35..57b9184ca60c 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -40,14 +40,21 @@ rec { # a superior CPU has all the features of an inferior and is able to build and test code for it inferiors = { # x86_64 Intel + # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html default = [ ]; westmere = [ ]; - sandybridge = [ "westmere" ] ++ inferiors.westmere; - ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; - haswell = [ "ivybridge" ] ++ inferiors.ivybridge; - broadwell = [ "haswell" ] ++ inferiors.haswell; - skylake = [ "broadwell" ] ++ inferiors.broadwell; - skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + cannonlake = [ "skylake-avx512" ] ++ inferiors.skylake-avx512; + icelake-client = [ "cannonlake" ] ++ inferiors.cannonlake; + icelake-server = [ "icelake-client" ] ++ inferiors.icelake-client; + cascadelake = [ "skylake-avx512" ] ++ inferiors.cannonlake; + cooperlake = [ "cascadelake" ] ++ inferiors.cascadelake; + tigerlake = [ "icelake-server" ] ++ inferiors.icelake-server; # x86_64 AMD # TODO: fill this (need testing) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index c14bddb11a13..406656dac1a9 100644 --- a/lib/tests/misc.nix +++ b/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/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8821e60af4b2..7e8816b4a0fe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -76,7 +76,7 @@ _0xB10C = { email = "nixpkgs@b10c.me"; name = "0xB10C"; - github = "0xb10c"; + github = "0xB10C"; githubId = 19157360; }; _0xbe7a = { @@ -169,6 +169,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _9999years = { + email = "rbt@fastmail.com"; + github = "9999years"; + githubId = 15312184; + name = "Rebecca Turner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -693,6 +699,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"; @@ -802,7 +817,7 @@ notbandali = { name = "Amin Bandali"; email = "bandali@gnu.org"; - github = "notbandali"; + github = "bandali0"; githubId = 1254858; keys = [{ fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; @@ -917,6 +932,12 @@ githubId = 106511; name = "Andrew Kelley"; }; + andrewsmith = { + email = "andrew@velvet.software"; + github = "andrewsmith"; + githubId = 29887; + name = "Andrew Smith"; + }; andsild = { email = "andsild@gmail.com"; github = "andsild"; @@ -1396,6 +1417,12 @@ githubId = 12958979; name = "Mika Naylor"; }; + avakhrenev = { + email = "avakhrenev@gmail.com"; + github = "avakhrenev"; + githubId = 1060224; + name = "Alexey Vakhrenev"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "Avaq"; @@ -1745,7 +1772,7 @@ benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; - github = "benesim"; + github = "BeneSim"; githubId = 29384538; keys = [{ fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; @@ -2367,6 +2394,12 @@ github = "CaptainJawZ"; githubId = 43111068; }; + CardboardTurkey = { + name = "Kiran Ostrolenk"; + email = "kostrolenk@gmail.com"; + github = "CardboardTurkey"; + githubId = 34030186; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -3115,7 +3148,7 @@ cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; - githubId = 389387; + githubId = 119854490; name = "Serg Nesterov"; keys = [{ fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; @@ -3394,7 +3427,7 @@ }; davsanchez = { email = "davidslt+nixpkgs@pm.me"; - github = "davsanchez"; + github = "DavSanchez"; githubId = 11422515; name = "David Sánchez"; }; @@ -3729,12 +3762,6 @@ githubId = 14034137; name = "Mostly Void"; }; - dizfer = { - email = "david@izquierdofernandez.com"; - github = "DIzFer"; - githubId = 8852888; - name = "David Izquierdo"; - }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -3840,6 +3867,12 @@ githubId = 39825; name = "Dominik Honnef"; }; + doriath = { + email = "tomasz.zurkowski@gmail.com"; + github = "doriath"; + githubId = 150959; + name = "Tomasz Zurkowski"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; @@ -3881,6 +3914,7 @@ name = "Davide Peressoni"; email = "davide.peressoni@tuta.io"; matrix = "@dpd-:matrix.org"; + github = "DPDmancul"; githubId = 3186857; }; dpercy = { @@ -4311,7 +4345,7 @@ }; elnudev = { email = "elnu@elnu.com"; - github = "elnudev"; + github = "ElnuDev"; githubId = 9874955; name = "Elnu"; }; @@ -4599,7 +4633,7 @@ }; ewok = { email = "ewok@ewok.ru"; - github = "ewok"; + github = "ewok-old"; githubId = 454695; name = "Artur Taranchiev"; }; @@ -5154,6 +5188,12 @@ githubId = 606000; name = "Gabriel Adomnicai"; }; + garaiza-93 = { + email = "araizagustavo93@gmail.com"; + github = "garaiza-93"; + githubId = 57430880; + name = "Gustavo Araiza"; + }; Gabriel439 = { email = "Gabriel439@gmail.com"; github = "Gabriella439"; @@ -5254,6 +5294,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"; @@ -5721,7 +5770,7 @@ }; harrisonthorne = { email = "harrisonthorne@proton.me"; - github = "harrisonthorne"; + github = "muni-corn"; githubId = 33523827; name = "Harrison Thorne"; }; @@ -6062,6 +6111,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"; @@ -6638,6 +6693,12 @@ github = "jayeshbhoot"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -6944,7 +7005,7 @@ }; jkarlson = { email = "jekarlson@gmail.com"; - github = "jkarlson"; + github = "ethorsoe"; githubId = 1204734; name = "Emil Karlson"; }; @@ -7015,6 +7076,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"; @@ -7226,6 +7293,12 @@ github = "jorsn"; githubId = 4646725; }; + joshniemela = { + name = "Joshua Niemelä"; + email = "josh@jniemela.dk"; + github = "joshniemela"; + githubId = 88747315; + }; joshuafern = { name = "Joshua Fern"; email = "joshuafern@protonmail.com"; @@ -7716,7 +7789,7 @@ name = "Kid"; }; kidsan = { - github = "kidsan"; + github = "Kidsan"; githubId = 8798449; name = "kidsan"; }; @@ -8506,6 +8579,12 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luizirber = { + email = "nixpkgs@luizirber.org"; + github = "luizirber"; + githubId = 6642; + name = "Luiz Irber"; + }; luizribeiro = { email = "nixpkgs@l9o.dev"; matrix = "@luizribeiro:matrix.org"; @@ -8613,6 +8692,8 @@ loveisgrief = { name = "LoveIsGrief"; email = "loveisgrief@tuta.io"; + github = "LoveIsGrief"; + githubId = 2829538; keys = [{ fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; }]; @@ -8764,7 +8845,7 @@ }; lux = { email = "lux@lux.name"; - github = "luxferresum"; + github = "luxzeitlos"; githubId = 1208273; matrix = "@lux:ontheblueplanet.com"; name = "Lux"; @@ -8918,8 +8999,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"; @@ -9243,7 +9324,7 @@ }; maxwell-lt = { email = "maxwell.lt@live.com"; - github = "maxwell-lt"; + github = "Maxwell-lt"; githubId = 17859747; name = "Maxwell L-T"; }; @@ -9882,7 +9963,7 @@ name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; matrix = "@mon:tchncs.de"; - github = "MonAaraj"; + github = "ribosomerocker"; githubId = 46468162; }; monsieurp = { @@ -9993,6 +10074,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"; @@ -10125,7 +10212,7 @@ munksgaard = { name = "Philip Munksgaard"; email = "philip@munksgaard.me"; - github = "munksgaard"; + github = "Munksgaard"; githubId = 230613; matrix = "@philip:matrix.munksgaard.me"; keys = [{ @@ -10460,6 +10547,12 @@ github = "nikstur"; githubId = 61635709; }; + nintron = { + email = "nintron@sent.com"; + github = "Nintron27"; + githubId = 47835714; + name = "Nintron"; + }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; @@ -10742,7 +10835,7 @@ }; nrhelmi = { email = "helmiinour@gmail.com"; - github = "nrhelmi"; + github = "NRHelmi"; githubId = 15707703; name = "Helmi Nour"; }; @@ -11119,7 +11212,7 @@ }; paddygord = { email = "pgpatrickgordon@gmail.com"; - github = "paddygord"; + github = "avaunit02"; githubId = 10776658; name = "Patrick Gordon"; }; @@ -11242,6 +11335,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + paveloom = { + email = "paveloom@riseup.net"; + github = "paveloom"; + githubId = 49961859; + name = "Pavel Sobolev"; + }; payas = { email = "relekarpayas@gmail.com"; github = "bhankas"; @@ -12169,7 +12268,7 @@ }; ratsclub = { email = "victor@freire.dev.br"; - github = "vtrf"; + github = "ratsclub"; githubId = 25647735; name = "Victor Freire"; }; @@ -12433,7 +12532,7 @@ }; rika = { email = "rika@paymentswit.ch"; - github = "NekomimiScience"; + github = "ScarletHg"; githubId = 1810487; name = "Rika"; }; @@ -12779,6 +12878,12 @@ githubId = 5236428; name = "Gaëtan André"; }; + rvnstn = { + email = "github@rvnstn.de"; + github = "rvnstn"; + githubId = 2364742; + name = "Tobias Ravenstein"; + }; rvolosatovs = { email = "rvolosatovs@riseup.net"; github = "rvolosatovs"; @@ -13234,6 +13339,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"; @@ -13326,6 +13437,12 @@ githubId = 16765155; name = "Shardul Baral"; }; + sharzy = { + email = "me@sharzy.in"; + github = "SharzyL"; + githubId = 46294732; + name = "Sharzy"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "sdellysse"; @@ -13416,7 +13533,7 @@ shreerammodi = { name = "Shreeram Modi"; email = "shreerammodi10@gmail.com"; - github = "Shrimpram"; + github = "shrimpram"; githubId = 67710369; keys = [{ fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; @@ -13651,6 +13768,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"; @@ -14374,6 +14497,12 @@ githubId = 139251; name = "Tom Hunger"; }; + tehmatt = { + name = "tehmatt"; + email = "nix@programsareproofs.com"; + github = "tehmatt"; + githubId = 3358866; + }; tejasag = { name = "Tejas Agarwal"; email = "tejasagarwalbly@gmail.com"; @@ -14396,7 +14525,7 @@ }; teozkr = { email = "teo@nullable.se"; - github = "teozkr"; + github = "nightkr"; githubId = 649832; name = "Teo Klestrup Röijezon"; }; @@ -14810,7 +14939,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:matrix.org"; + matrix = "@toastal:chat.mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -14883,7 +15012,7 @@ }; tonyshkurenko = { email = "support@twingate.com"; - github = "tonyshkurenko"; + github = "antonshkurenko"; githubId = 8597964; name = "Anton Shkurenko"; }; @@ -15222,7 +15351,7 @@ }; uthar = { email = "galkowskikasper@gmail.com"; - github = "uthar"; + github = "Uthar"; githubId = 15697697; name = "Kasper Gałkowski"; }; @@ -15270,6 +15399,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"; @@ -16048,6 +16183,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yajo = { + email = "yajo.sk8@gmail.com"; + github = "yajo"; + githubId = 973709; + name = "Jairo Llopis"; + }; yana = { email = "yana@riseup.net"; github = "yanalunaterra"; @@ -16340,7 +16481,7 @@ zebreus = { matrix = "@lennart:cicen.net"; email = "lennarteichhorn+nixpkgs@gmail.com"; - github = "Zebreus"; + github = "zebreus"; githubId = 1557253; name = "Lennart Eichhorn"; }; @@ -16406,7 +16547,7 @@ name = "zimbatm"; }; Zimmi48 = { - email = "theo.zimmermann@univ-paris-diderot.fr"; + email = "theo.zimmermann@telecom-paris.fr"; github = "Zimmi48"; githubId = 1108325; name = "Théo Zimmermann"; diff --git a/maintainers/scripts/haskell/maintainer-handles.nix b/maintainers/scripts/haskell/maintainer-handles.nix index 08c6bc4c96af..d650e82f8b0c 100644 --- a/maintainers/scripts/haskell/maintainer-handles.nix +++ b/maintainers/scripts/haskell/maintainer-handles.nix @@ -1,7 +1,21 @@ # Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. +# +# This script produces an attr set mapping of email addresses to GitHub handles: +# +# ```nix +# > import ./maintainer-handles.nix +# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... } +# ``` +# +# This mapping contains all maintainers in ../../mainatainer-list.nix, but it +# ignores maintainers who don't have a GitHub account or an email address. let pkgs = import ../../.. {}; maintainers = import ../../maintainer-list.nix; inherit (pkgs) lib; - mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {}; + mkMailGithubPair = _: maintainer: + if (maintainer ? email) && (maintainer ? github) then + { "${maintainer.email}" = maintainer.github; } + else + {}; in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 49ddf1f10be8..4d338675c654 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -312,6 +312,19 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + graalvm-ce = { + members = [ + bandresen + hlolli + glittershark + babariviere + ericdallo + thiagokokada + ]; + scope = "Maintain GraalVM Community Edition packages."; + shortName = "GraalVM-CE"; + }; + haskell = { members = [ cdepillabout diff --git a/nixos/doc/manual/.gitignore b/nixos/doc/manual/.gitignore deleted file mode 100644 index 879282624217..000000000000 --- a/nixos/doc/manual/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -generated -manual-combined.xml diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile deleted file mode 100644 index b2b6481b20c7..000000000000 --- a/nixos/doc/manual/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -.PHONY: all -all: manual-combined.xml - -.PHONY: debug -debug: generated manual-combined.xml - -manual-combined.xml: generated *.xml **/*.xml - rm -f ./manual-combined.xml - nix-shell --pure -Q --packages xmloscopy \ - --run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml" - -.PHONY: format -format: - nix-shell --pure -Q --packages xmlformat \ - --run "find ../../ -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ - xmlformat --config-file '../xmlformat.conf' -i {}" - -.PHONY: fix-misc-xml -fix-misc-xml: - find . -iname '*.xml' -type f \ - -exec ../varlistentry-fixer.rb {} ';' - -.PHONY: clean -clean: - rm -f manual-combined.xml generated - -generated: - nix-build ../../release.nix \ - --attr manualGeneratedSources.x86_64-linux \ - --out-link ./generated diff --git a/nixos/doc/manual/administration/containers.chapter.md b/nixos/doc/manual/administration/containers.chapter.md index ea51f91f698f..50493b562b54 100644 --- a/nixos/doc/manual/administration/containers.chapter.md +++ b/nixos/doc/manual/administration/containers.chapter.md @@ -21,8 +21,8 @@ which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system. -```{=docbook} - - - +```{=include=} sections +imperative-containers.section.md +declarative-containers.section.md +container-networking.section.md ``` diff --git a/nixos/doc/manual/administration/running.md b/nixos/doc/manual/administration/running.md new file mode 100644 index 000000000000..48e8c7c6668b --- /dev/null +++ b/nixos/doc/manual/administration/running.md @@ -0,0 +1,14 @@ +# Administration {#ch-running} + +This chapter describes various aspects of managing a running NixOS system, such as how to use the {command}`systemd` service manager. + +```{=include=} chapters +service-mgmt.chapter.md +rebooting.chapter.md +user-sessions.chapter.md +control-groups.chapter.md +logging.chapter.md +cleaning-store.chapter.md +containers.chapter.md +troubleshooting.chapter.md +``` diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml deleted file mode 100644 index d9fcc1aee263..000000000000 --- a/nixos/doc/manual/administration/running.xml +++ /dev/null @@ -1,21 +0,0 @@ - - Administration - - - This chapter describes various aspects of managing a running NixOS system, - such as how to use the systemd service manager. - - - - - - - - - - - diff --git a/nixos/doc/manual/administration/troubleshooting.chapter.md b/nixos/doc/manual/administration/troubleshooting.chapter.md index 548456eaf6d6..1253607f8efc 100644 --- a/nixos/doc/manual/administration/troubleshooting.chapter.md +++ b/nixos/doc/manual/administration/troubleshooting.chapter.md @@ -3,10 +3,10 @@ This chapter describes solutions to common problems you might encounter when you manage your NixOS system. -```{=docbook} - - - - - +```{=include=} sections +boot-problems.section.md +maintenance-mode.section.md +rollback.section.md +store-corruption.section.md +network-problems.section.md ``` diff --git a/nixos/doc/manual/configuration/config-syntax.chapter.md b/nixos/doc/manual/configuration/config-syntax.chapter.md index 9f8d45d58899..9e606b2b82af 100644 --- a/nixos/doc/manual/configuration/config-syntax.chapter.md +++ b/nixos/doc/manual/configuration/config-syntax.chapter.md @@ -11,8 +11,8 @@ manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions), but here we give a short overview of the most important constructs useful in NixOS configuration files. -```{=docbook} - - - +```{=include=} sections +config-file.section.md +abstractions.section.md +modularity.section.md ``` diff --git a/nixos/doc/manual/configuration/configuration.md b/nixos/doc/manual/configuration/configuration.md new file mode 100644 index 000000000000..4c966f3325b9 --- /dev/null +++ b/nixos/doc/manual/configuration/configuration.md @@ -0,0 +1,27 @@ +# Configuration {#ch-configuration} + +This chapter describes how to configure various aspects of a NixOS machine through the configuration file {file}`/etc/nixos/configuration.nix`. As described in [](#sec-changing-config), changes to this file only take effect after you run {command}`nixos-rebuild`. + +```{=include=} chapters +config-syntax.chapter.md +package-mgmt.chapter.md +user-mgmt.chapter.md +file-systems.chapter.md +x-windows.chapter.md +wayland.chapter.md +gpu-accel.chapter.md +xfce.chapter.md +networking.chapter.md +linux-kernel.chapter.md +subversion.chapter.md +``` + +```{=include=} chapters +@MODULE_CHAPTERS@ +``` + +```{=include=} chapters +profiles.chapter.md +kubernetes.chapter.md +``` + diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml deleted file mode 100644 index b04316cfa48e..000000000000 --- a/nixos/doc/manual/configuration/configuration.xml +++ /dev/null @@ -1,31 +0,0 @@ - - Configuration - - - This chapter describes how to configure various aspects of a NixOS machine - through the configuration file - /etc/nixos/configuration.nix. As described in - , changes to this file only take - effect after you run nixos-rebuild. - - - - - - - - - - - - - - - - - - diff --git a/nixos/doc/manual/configuration/declarative-packages.section.md b/nixos/doc/manual/configuration/declarative-packages.section.md index 337cdf8472e4..02eaa56192e4 100644 --- a/nixos/doc/manual/configuration/declarative-packages.section.md +++ b/nixos/doc/manual/configuration/declarative-packages.section.md @@ -40,7 +40,7 @@ configuration use `pkgs` prefix (variable). To "uninstall" a package, simply remove it from [](#opt-environment.systemPackages) and run `nixos-rebuild switch`. -```{=docbook} - - +```{=include=} sections +customizing-packages.section.md +adding-custom-packages.section.md ``` diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md index 901e2e4f181b..aca978be064d 100644 --- a/nixos/doc/manual/configuration/file-systems.chapter.md +++ b/nixos/doc/manual/configuration/file-systems.chapter.md @@ -36,7 +36,7 @@ dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding `options = [ "nofail" ];`. ::: -```{=docbook} - - +```{=include=} sections +luks-file-systems.section.md +sshfs-file-systems.section.md ``` diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 3395ace20c4f..2eff15387987 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -67,7 +67,13 @@ When using multiple modules, you may need to access configuration values defined in other modules. This is what the `config` function argument is for: it contains the complete, merged system configuration. That is, `config` is the result of combining the configurations returned by every -module [^1] . For example, here is a module that adds some packages to +module. (If you're wondering how it's possible that the (indirect) *result* +of a function is passed as an *input* to that same function: that's +because Nix is a "lazy" language --- it only computes values when +they are needed. This works as long as no individual configuration +value depends on itself.) + +For example, here is a module that adds some packages to [](#opt-environment.systemPackages) only if [](#opt-services.xserver.enable) is set to `true` somewhere else: @@ -125,9 +131,3 @@ in { imports = [ (netConfig "nixos.localdomain") ]; } ``` - -[^1]: If you're wondering how it's possible that the (indirect) *result* - of a function is passed as an *input* to that same function: that's - because Nix is a "lazy" language --- it only computes values when - they are needed. This works as long as no individual configuration - value depends on itself. diff --git a/nixos/doc/manual/configuration/networking.chapter.md b/nixos/doc/manual/configuration/networking.chapter.md index 529dc0610bda..abbd9766f173 100644 --- a/nixos/doc/manual/configuration/networking.chapter.md +++ b/nixos/doc/manual/configuration/networking.chapter.md @@ -3,14 +3,14 @@ This section describes how to configure networking components on your NixOS machine. -```{=docbook} - - - - - - - - +```{=include=} sections +network-manager.section.md +ssh.section.md +ipv4-config.section.md +ipv6-config.section.md +firewall.section.md +wireless.section.md +ad-hoc-network-config.section.md +renaming-interfaces.section.md ``` diff --git a/nixos/doc/manual/configuration/package-mgmt.chapter.md b/nixos/doc/manual/configuration/package-mgmt.chapter.md index a6c414be59a9..1148bbe84740 100644 --- a/nixos/doc/manual/configuration/package-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/package-mgmt.chapter.md @@ -12,7 +12,7 @@ NixOS has two distinct styles of package management: `nix-env` command. This style allows mixing packages from different Nixpkgs versions. It's the only choice for non-root users. -```{=docbook} - - +```{=include=} sections +declarative-packages.section.md +ad-hoc-packages.section.md ``` diff --git a/nixos/doc/manual/configuration/profiles.chapter.md b/nixos/doc/manual/configuration/profiles.chapter.md index 2c3dea27c181..9f1f48f742ac 100644 --- a/nixos/doc/manual/configuration/profiles.chapter.md +++ b/nixos/doc/manual/configuration/profiles.chapter.md @@ -19,16 +19,16 @@ install media, many are actually intended to be used in real installs. What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope. -```{=docbook} - - - - - - - - - - - +```{=include=} sections +profiles/all-hardware.section.md +profiles/base.section.md +profiles/clone-config.section.md +profiles/demo.section.md +profiles/docker-container.section.md +profiles/graphical.section.md +profiles/hardened.section.md +profiles/headless.section.md +profiles/installation-device.section.md +profiles/minimal.section.md +profiles/qemu-guest.section.md ``` diff --git a/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/nixos/doc/manual/configuration/sshfs-file-systems.section.md index 4dd1b203a249..d8c9dea6c337 100644 --- a/nixos/doc/manual/configuration/sshfs-file-systems.section.md +++ b/nixos/doc/manual/configuration/sshfs-file-systems.section.md @@ -8,7 +8,7 @@ It means that if you have SSH access to a machine, no additional setup is needed ## Interactive mounting {#sec-sshfs-interactive} -In NixOS, SSHFS is packaged as sshfs. +In NixOS, SSHFS is packaged as `sshfs`. Once installed, mounting a directory interactively is simple as running: ```ShellSession $ sshfs my-user@example.com:/my-dir /mnt/my-dir diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index be185cf4c314..bef35f448874 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -69,7 +69,7 @@ Wine, you should also set the following: hardware.opengl.driSupport32Bit = true; ``` -## Auto-login {#sec-x11-auto-login .unnumbered} +## Auto-login {#sec-x11-auto-login} The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your @@ -96,7 +96,7 @@ services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "alice"; ``` -## Intel Graphics drivers {#sec-x11--graphics-cards-intel .unnumbered} +## Intel Graphics drivers {#sec-x11--graphics-cards-intel} There are two choices for Intel Graphics drivers in X.org: `modesetting` (included in the xorg-server itself) and `intel` (provided by the @@ -136,7 +136,7 @@ services.xserver.deviceSection = '' Note that this will likely downgrade the performance compared to `modesetting` or `intel` with DRI 3 (default). -## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia .unnumbered} +## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia} NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by @@ -158,7 +158,7 @@ services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. -## Proprietary AMD drivers {#sec-x11--graphics-cards-amd .unnumbered} +## Proprietary AMD drivers {#sec-x11--graphics-cards-amd} AMD provides a proprietary driver for its graphics cards that is not enabled by default because it's not Free Software, is often broken in @@ -173,7 +173,7 @@ services.xserver.videoDrivers = [ "amdgpu-pro" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. -## Touchpads {#sec-x11-touchpads .unnumbered} +## Touchpads {#sec-x11-touchpads} Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: @@ -192,7 +192,7 @@ services.xserver.libinput.touchpad.tapping = false; Note: the use of `services.xserver.synaptics` is deprecated since NixOS 17.09. -## GTK/Qt themes {#sec-x11-gtk-and-qt-themes .unnumbered} +## GTK/Qt themes {#sec-x11-gtk-and-qt-themes} GTK themes can be installed either to user profile or system-wide (via `environment.systemPackages`). To make Qt 5 applications look similar to @@ -204,7 +204,7 @@ qt.platformTheme = "gtk2"; qt.style = "gtk2"; ``` -## Custom XKB layouts {#custom-xkb-layouts .unnumbered} +## Custom XKB layouts {#custom-xkb-layouts} It is possible to install custom [ XKB ](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index c331e63cfe54..a80be2b523e2 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -24,7 +24,7 @@ Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your [](#opt-environment.systemPackages) from `pkgs.xfce`. -## Thunar {#sec-xfce-thunar-plugins .unnumbered} +## Thunar {#sec-xfce-thunar-plugins} Thunar (the Xfce file manager) is automatically enabled when Xfce is enabled. To enable Thunar without enabling Xfce, use the configuration @@ -35,7 +35,7 @@ If you'd like to add extra plugins to Thunar, add them to [](#opt-programs.thunar.plugins). You shouldn't just add them to [](#opt-environment.systemPackages). -## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} +## Troubleshooting {#sec-xfce-troubleshooting} Even after enabling udisks2, volume management might not work. Thunar and/or the desktop takes time to show up. Thunar will spit out this kind @@ -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/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 557599809222..c306cc084cdb 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -6,7 +6,6 @@ You can quickly check your edits with the following: ```ShellSession $ cd /path/to/nixpkgs -$ ./nixos/doc/manual/md-to-db.sh $ nix-build nixos/release.nix -A manual.x86_64-linux ``` diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 264a8bcef27c..714b3efca20a 100644 --- a/nixos/doc/manual/default.nix +++ b/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 = @@ -66,34 +68,6 @@ let optionIdPrefix = "test-opt-"; }; - sources = lib.sourceFilesBySuffices ./. [".xml"]; - - modulesDoc = runCommand "modules.xml" { - nativeBuildInputs = [ pkgs.nixos-render-docs ]; - } '' - nixos-render-docs manual docbook \ - --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ - "$out" \ - --section \ - --section-id modules \ - --chapters ${lib.concatMapStrings (p: "${p.value} ") config.meta.doc} - ''; - - generatedSources = runCommand "generated-docbook" {} '' - mkdir $out - ln -s ${modulesDoc} $out/modules.xml - ln -s ${optionsDoc.optionsDocBook} $out/options-db.xml - ln -s ${testOptionsDoc.optionsDocBook} $out/test-options-db.xml - printf "%s" "${version}" > $out/version - ''; - - copySources = - '' - cp -prd $sources/* . # */ - ln -s ${generatedSources} ./generated - chmod -R u+w . - ''; - toc = builtins.toFile "toc.xml" '' @@ -124,70 +98,102 @@ let "--stringparam chunk.toc ${toc}" ]; + linterFunctions = '' + # outputs the context of an xmllint error output + # LEN lines around the failing line are printed + function context { + # length of context + local LEN=6 + # lines to print before error line + local BEFORE=4 + + # xmllint output lines are: + # file.xml:1234: there was an error on line 1234 + while IFS=':' read -r file line rest; do + echo + if [[ -n "$rest" ]]; then + echo "$file:$line:$rest" + local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1)) + # number lines & filter context + nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p" + else + if [[ -n "$line" ]]; then + echo "$file:$line" + else + echo "$file" + fi + fi + done + } + + function lintrng { + xmllint --debug --noout --nonet \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + "$1" \ + 2>&1 | context 1>&2 + # ^ redirect assumes xmllint doesn’t print to stdout + } + ''; + manual-combined = runCommand "nixos-manual-combined" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { inputs = lib.sourceFilesBySuffices ./. [ ".xml" ".md" ]; + nativeBuildInputs = [ pkgs.nixos-render-docs pkgs.libxml2.bin pkgs.libxslt.bin ]; meta.description = "The NixOS manual as plain docbook XML"; } '' - ${copySources} + cp -r --no-preserve=all $inputs/* . - xmllint --xinclude --output ./manual-combined.xml ./manual.xml - xmllint --xinclude --noxincludenode \ - --output ./man-pages-combined.xml ./man-pages.xml + substituteInPlace ./manual.md \ + --replace '@NIXOS_VERSION@' "${version}" + substituteInPlace ./configuration/configuration.md \ + --replace \ + '@MODULE_CHAPTERS@' \ + ${lib.escapeShellArg (lib.concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)} + substituteInPlace ./nixos-options.md \ + --replace \ + '@NIXOS_OPTIONS_JSON@' \ + ${optionsDoc.optionsJSON}/share/doc/nixos/options.json + substituteInPlace ./development/writing-nixos-tests.section.md \ + --replace \ + '@NIXOS_TEST_OPTIONS_JSON@' \ + ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json - # outputs the context of an xmllint error output - # LEN lines around the failing line are printed - function context { - # length of context - local LEN=6 - # lines to print before error line - local BEFORE=4 + nixos-render-docs -j $NIX_BUILD_CORES manual docbook \ + --manpage-urls ${manpageUrls} \ + --revision ${lib.escapeShellArg revision} \ + ./manual.md \ + ./manual-combined.xml - # xmllint output lines are: - # file.xml:1234: there was an error on line 1234 - while IFS=':' read -r file line rest; do - echo - if [[ -n "$rest" ]]; then - echo "$file:$line:$rest" - local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1)) - # number lines & filter context - nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p" - else - if [[ -n "$line" ]]; then - echo "$file:$line" - else - echo "$file" - fi - fi - done - } - - function lintrng { - xmllint --debug --noout --nonet \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - "$1" \ - 2>&1 | context 1>&2 - # ^ redirect assumes xmllint doesn’t print to stdout - } + ${linterFunctions} mkdir $out cp manual-combined.xml $out/ - cp man-pages-combined.xml $out/ lintrng $out/manual-combined.xml - lintrng $out/man-pages-combined.xml + ''; + + manpages-combined = runCommand "nixos-manpages-combined.xml" + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + meta.description = "The NixOS manpages as plain docbook XML"; + } + '' + mkdir generated + cp -prd ${./man-pages.xml} man-pages.xml + ln -s ${optionsDoc.optionsDocBook} generated/options-db.xml + + xmllint --xinclude --noxincludenode --output $out ./man-pages.xml + + ${linterFunctions} + + lintrng $out ''; in rec { - inherit generatedSources; - inherit (optionsDoc) optionsJSON optionsNix optionsDocBook optionsUsedDocbook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; meta.description = "The NixOS manual in HTML format"; allowedReferences = ["out"]; } @@ -224,8 +230,7 @@ in rec { manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html"; manualEpub = runCommand "nixos-manual-epub" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; } '' # Generate the epub manual. @@ -253,11 +258,13 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" - { inherit sources; - nativeBuildInputs = [ + { nativeBuildInputs = [ + buildPackages.installShellFiles + ] ++ lib.optionals allowDocBook [ buildPackages.libxml2.bin buildPackages.libxslt.bin - buildPackages.installShellFiles + ] ++ lib.optionals (! allowDocBook) [ + buildPackages.nixos-render-docs ]; allowedReferences = ["out"]; } @@ -265,14 +272,24 @@ in rec { # Generate manpages. mkdir -p $out/share/man/man8 installManPage ${./manpages}/* - 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 + ${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 \ + ${manpages-combined} + '' + else '' + mkdir -p $out/share/man/man5 + nixos-render-docs -j $NIX_BUILD_CORES options manpage \ + --revision ${lib.escapeShellArg revision} \ + ${optionsJSON}/share/doc/nixos/options.json \ + $out/share/man/man5/configuration.nix.5 + ''} ''; } diff --git a/nixos/doc/manual/development/developing-the-test-driver.chapter.md b/nixos/doc/manual/development/developing-the-test-driver.chapter.md new file mode 100644 index 000000000000..4b70fe00af47 --- /dev/null +++ b/nixos/doc/manual/development/developing-the-test-driver.chapter.md @@ -0,0 +1,43 @@ + +# Developing the NixOS Test Driver {#chap-developing-the-test-driver} + +The NixOS test framework is a project of its own. + +It consists of roughly the following components: + + - `nixos/lib/test-driver`: The Python framework that sets up the test and runs the [`testScript`](#test-opt-testScript) + - `nixos/lib/testing`: The Nix code responsible for the wiring, written using the (NixOS) Module System. + +These components are exposed publicly through: + + - `nixos/lib/default.nix`: The public interface that exposes the `nixos/lib/testing` entrypoint. + - `flake.nix`: Exposes the `lib.nixos`, including the public test interface. + +Beyond the test driver itself, its integration into NixOS and Nixpkgs is important. + + - `pkgs/top-level/all-packages.nix`: Defines the `nixosTests` attribute, used + by the package `tests` attributes and OfBorg. + - `nixos/release.nix`: Defines the `tests` attribute built by Hydra, independently, but analogous to `nixosTests` + - `nixos/release-combined.nix`: Defines which tests are channel blockers. + +Finally, we have legacy entrypoints that users should move away from, but are cared for on a best effort basis. +These include `pkgs.nixosTest`, `testing-python.nix` and `make-test-python.nix`. + +## Testing changes to the test framework {#sec-test-the-test-framework} + +When making significant changes to the test framework, we run the tests on Hydra, to avoid disrupting the larger NixOS project. + +For this, we use the `python-test-refactoring` branch in the `NixOS/nixpkgs` repository, and its [corresponding Hydra jobset](https://hydra.nixos.org/jobset/nixos/python-test-refactoring). +This branch is used as a pointer, and not as a feature branch. + +1. Rebase the PR onto a recent, good evaluation of `nixos-unstable` +2. Create a baseline evaluation by force-pushing this revision of `nixos-unstable` to `python-test-refactoring`. +3. Note the evaluation number (we'll call it ``) +4. Push the PR to `python-test-refactoring` and evaluate the PR on Hydra +5. Create a comparison URL by navigating to the latest build of the PR and adding to the URL `?compare=`. This is not necessary for the evaluation that comes right after the baseline. + +Review the removed tests and newly failed tests using the constructed URL; otherwise you will accidentally compare iterations of the PR instead of changes to the PR base. + +As we currently have some flaky tests, newly failing tests are expected, but should be reviewed to make sure that + - The number of failures did not increase significantly. + - All failures that do occur can reasonably be assumed to fail for a different reason than the changes. diff --git a/nixos/doc/manual/development/development.md b/nixos/doc/manual/development/development.md new file mode 100644 index 000000000000..76f405c3b29c --- /dev/null +++ b/nixos/doc/manual/development/development.md @@ -0,0 +1,15 @@ +# Development {#ch-development} + +This chapter describes how you can modify and extend NixOS. + +```{=include=} chapters +sources.chapter.md +writing-modules.chapter.md +building-parts.chapter.md +bootspec.chapter.md +what-happens-during-a-system-switch.chapter.md +writing-documentation.chapter.md +nixos-tests.chapter.md +developing-the-test-driver.chapter.md +testing-installer.chapter.md +``` diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml deleted file mode 100644 index 949468c9021d..000000000000 --- a/nixos/doc/manual/development/development.xml +++ /dev/null @@ -1,20 +0,0 @@ - - Development - - - This chapter describes how you can modify and extend NixOS. - - - - - - - - - - - diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md index 10e876b96d59..514a06f97ee7 100644 --- a/nixos/doc/manual/development/freeform-modules.section.md +++ b/nixos/doc/manual/development/freeform-modules.section.md @@ -13,9 +13,8 @@ checking for entire option trees, it is only recommended for use in submodules. ::: {#ex-freeform-module .example} -::: {.title} **Example: Freeform submodule** -::: + The following shows a submodule assigning a freeform type that allows arbitrary attributes with `str` values below `settings`, but also declares an option for the `settings.port` attribute to have it diff --git a/nixos/doc/manual/development/nixos-tests.chapter.md b/nixos/doc/manual/development/nixos-tests.chapter.md index 2a4fdddeaa66..ec0e4b9f076a 100644 --- a/nixos/doc/manual/development/nixos-tests.chapter.md +++ b/nixos/doc/manual/development/nixos-tests.chapter.md @@ -5,9 +5,9 @@ NixOS tests are kept in the directory `nixos/tests`, and are executed (using Nix) by a testing framework that automatically starts one or more virtual machines containing the NixOS system(s) required for the test. -```{=docbook} - - - - +```{=include=} sections +writing-nixos-tests.section.md +running-nixos-tests.section.md +running-nixos-tests-interactively.section.md +linking-nixos-tests-to-packages.section.md ``` diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 18ec7ba903a9..59470bf1bc11 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -87,6 +87,7 @@ lib.mkOption { description = lib.mdDoc "Whether to enable magic."; } ``` +::: ### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption} @@ -108,7 +109,7 @@ You can omit the default path if the name of the option is also attribute path i During the transition to CommonMark documentation `mkPackageOption` creates an option with a DocBook description attribute, once the transition is completed it will create a CommonMark description instead. `mkPackageOptionMD` always creates an option with a CommonMark description attribute and will be removed some time after the transition is completed. -::: {#ex-options-declarations-util-mkPackageOption .title} +[]{#ex-options-declarations-util-mkPackageOption} Examples: ::: {#ex-options-declarations-util-mkPackageOption-hello .example} @@ -122,6 +123,7 @@ lib.mkOption { description = lib.mdDoc "The hello package to use."; } ``` +::: ::: {#ex-options-declarations-util-mkPackageOption-ghc .example} ```nix @@ -138,6 +140,7 @@ lib.mkOption { description = lib.mdDoc "The GHC package to use."; } ``` +::: ## Extensible Option Types {#sec-option-declarations-eot} @@ -186,9 +189,7 @@ changing the main service module file and the type system automatically enforces that there can only be a single display manager enabled. ::: {#ex-option-declaration-eot-service .example} -::: {.title} **Example: Extensible type placeholder in the service module** -::: ```nix services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; @@ -198,9 +199,7 @@ services.xserver.displayManager.enable = mkOption { ::: ::: {#ex-option-declaration-eot-backend-gdm .example} -::: {.title} **Example: Extending `services.xserver.displayManager.enable` in the `gdm` module** -::: ```nix services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); @@ -209,9 +208,7 @@ services.xserver.displayManager.enable = mkOption { ::: ::: {#ex-option-declaration-eot-backend-sddm .example} -::: {.title} **Example: Extending `services.xserver.displayManager.enable` in the `sddm` module** -::: ```nix services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md index 22cf38873cf0..6a3dc26b99be 100644 --- a/nixos/doc/manual/development/option-def.section.md +++ b/nixos/doc/manual/development/option-def.section.md @@ -12,7 +12,7 @@ config = { However, sometimes you need to wrap an option definition or set of option definitions in a *property* to achieve certain effects: -## Delaying Conditionals {#sec-option-definitions-delaying-conditionals .unnumbered} +## Delaying Conditionals {#sec-option-definitions-delaying-conditionals} If a set of option definitions is conditional on the value of another option, you may need to use `mkIf`. Consider, for instance: @@ -56,7 +56,7 @@ config = { }; ``` -## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered} +## Setting Priorities {#sec-option-definitions-setting-priorities} A module can override the definitions of an option in other modules by setting an *override priority*. All option definitions that do not have the lowest @@ -72,7 +72,7 @@ This definition causes all other definitions with priorities above 10 to be discarded. The function `mkForce` is equal to `mkOverride 50`, and `mkDefault` is equal to `mkOverride 1000`. -## Ordering Definitions {#sec-option-definitions-ordering .unnumbered} +## Ordering Definitions {#sec-option-definitions-ordering} It is also possible to influence the order in which the definitions for an option are merged by setting an *order priority* with `mkOrder`. The default order priority is 1000. @@ -89,7 +89,7 @@ definitions in the final list value of `hardware.firmware`. Note that this is different from [override priorities](#sec-option-definitions-setting-priorities): setting an order does not affect whether the definition is included or not. -## Merging Configurations {#sec-option-definitions-merging .unnumbered} +## Merging Configurations {#sec-option-definitions-merging} In conjunction with `mkIf`, it is sometimes useful for a module to return multiple sets of option definitions, to be merged together as if diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 0e9c4a4d16be..51977c58333f 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -36,9 +36,8 @@ merging is handled. together. This type is recommended when the option type is unknown. ::: {#ex-types-anything .example} - ::: {.title} **Example: `types.anything` Example** - ::: + Two definitions of this type like ```nix @@ -357,9 +356,7 @@ you will still need to provide a default value (e.g. an empty attribute set) if you want to allow users to leave it undefined. ::: {#ex-submodule-direct .example} -::: {.title} **Example: Directly defined submodule** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -378,9 +375,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-reference .example} -::: {.title} **Example: Submodule defined as a reference** -::: ```nix let modOptions = { @@ -408,9 +403,7 @@ multiple definitions of the submodule option set ([Example: Definition of a list of submodules](#ex-submodule-listof-definition)). ::: {#ex-submodule-listof-declaration .example} -::: {.title} **Example: Declaration of a list of submodules** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -429,9 +422,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-listof-definition .example} -::: {.title} **Example: Definition of a list of submodules** -::: ```nix config.mod = [ { foo = 1; bar = "one"; } @@ -446,9 +437,7 @@ multiple named definitions of the submodule option set ([Example: Definition of attribute sets of submodules](#ex-submodule-attrsof-definition)). ::: {#ex-submodule-attrsof-declaration .example} -::: {.title} **Example: Declaration of attribute sets of submodules** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -467,9 +456,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-attrsof-definition .example} -::: {.title} **Example: Definition of attribute sets of submodules** -::: ```nix config.mod.one = { foo = 1; bar = "one"; }; config.mod.two = { foo = 2; bar = "two"; }; @@ -489,9 +476,8 @@ Types are mainly characterized by their `check` and `merge` functions. ([Example: Overriding a type check](#ex-extending-type-check-2)). ::: {#ex-extending-type-check-1 .example} - ::: {.title} **Example: Adding a type check** - ::: + ```nix byte = mkOption { description = "An integer between 0 and 255."; @@ -501,9 +487,8 @@ Types are mainly characterized by their `check` and `merge` functions. ::: ::: {#ex-extending-type-check-2 .example} - ::: {.title} **Example: Overriding a type check** - ::: + ```nix nixThings = mkOption { description = "words that start with 'nix'"; diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 334149d021cb..476ba4b03f9d 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -119,9 +119,8 @@ have a predefined type and string generator already declared under default Elixir keyword list -::: {#pkgs-formats-result} +[]{#pkgs-formats-result} These functions all return an attribute set with these values: -::: `type` @@ -144,9 +143,8 @@ These functions all return an attribute set with these values: ::: ::: {#ex-settings-nix-representable .example} -::: {.title} **Example: Module with conventional `settings` option** -::: + The following shows a module for an example program that uses a JSON configuration file. It demonstrates how above values can be used, along with some other related best practices. See the comments for @@ -220,9 +218,7 @@ the port, which will enforce it to be a valid integer and make it show up in the manual. ::: {#ex-settings-typed-attrs .example} -::: {.title} **Example: Declaring a type-checked `settings` attribute** -::: ```nix settings = lib.mkOption { type = lib.types.submodule { diff --git a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md index aad82831a3c2..9cbec729803a 100644 --- a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md +++ b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -47,7 +47,7 @@ Most of these actions are either self-explaining but some of them have to do with our units or the activation script. For this reason, these topics are explained in the next sections. -```{=docbook} - - +```{=include=} sections +unit-handling.section.md +activation-script.section.md ``` diff --git a/nixos/doc/manual/development/writing-documentation.chapter.md b/nixos/doc/manual/development/writing-documentation.chapter.md index 4986c9f0a81b..8d504dfb0b0a 100644 --- a/nixos/doc/manual/development/writing-documentation.chapter.md +++ b/nixos/doc/manual/development/writing-documentation.chapter.md @@ -83,7 +83,7 @@ Keep the following guidelines in mind when you create and add a topic: ## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic} -Open the parent XML file and add an `xi:include` element to the list of +Open the parent CommonMark file and add a line to the list of chapters with the file name of the topic that you created. If you created a `section`, you add the file to the `chapter` file. If you created a `chapter`, you add the file to the `part` file. diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index fa24679b7fc8..ae657458d768 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -37,9 +37,7 @@ options, but does not declare any. The structure of full NixOS modules is shown in [Example: Structure of NixOS Modules](#ex-module-syntax). ::: {#ex-module-syntax .example} -::: {.title} **Example: Structure of NixOS Modules** -::: ```nix { config, pkgs, ... }: @@ -102,9 +100,7 @@ Exec directives](#exec-escaping-example) for an example. When using these functions system environment substitution should *not* be disabled explicitly. ::: {#locate-example .example} -::: {.title} **Example: NixOS Module for the "locate" Service** -::: ```nix { config, lib, pkgs, ... }: @@ -165,9 +161,7 @@ in { ::: ::: {#exec-escaping-example .example} -::: {.title} **Example: Escaping in Exec directives** -::: ```nix { config, lib, pkgs, utils, ... }: @@ -195,14 +189,14 @@ in { ``` ::: -```{=docbook} - - - - - - - - - +```{=include=} sections +option-declarations.section.md +option-types.section.md +option-def.section.md +assertions.section.md +meta-attributes.section.md +importing-modules.section.md +replace-modules.section.md +freeform-modules.section.md +settings-options.section.md ``` diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 5bcdf6e58eb1..3de46fda3df6 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -417,8 +417,7 @@ with foo_running: `seconds_interval` -: - specifies how often the condition should be polled: +: specifies how often the condition should be polled: ```py @polling_condition(seconds_interval=10) @@ -428,8 +427,7 @@ def foo_running(): `description` -: - is used in the log when the condition is checked. If this is not provided, the description is pulled from the docstring of the function. These two are therefore equivalent: +: is used in the log when the condition is checked. If this is not provided, the description is pulled from the docstring of the function. These two are therefore equivalent: ```py @polling_condition @@ -472,6 +470,8 @@ In that case, `numpy` is chosen from the generic `python3Packages`. The following options can be used when writing tests. -```{=docbook} - +```{=include=} options +id-prefix: test-opt- +list-id: test-options-list +source: @NIXOS_TEST_OPTIONS_JSON@ ``` diff --git a/nixos/doc/manual/from_md/README.md b/nixos/doc/manual/from_md/README.md deleted file mode 100644 index cc6d08ca0a15..000000000000 --- a/nixos/doc/manual/from_md/README.md +++ /dev/null @@ -1,5 +0,0 @@ -This directory is temporarily needed while we transition the manual to CommonMark. It stores the output of the ../md-to-db.sh script that converts CommonMark files back to DocBook. - -We are choosing to convert the Markdown to DocBook at authoring time instead of manual building time, because we do not want the pandoc toolchain to become part of the NixOS closure. - -Do not edit the DocBook files inside this directory or its subdirectories. Instead, edit the corresponding .md file in the normal manual directories, and run ../md-to-db.sh to update the file here. diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml deleted file mode 100644 index 144661c86eba..000000000000 --- a/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ /dev/null @@ -1,144 +0,0 @@ -
- Boot Problems - - If NixOS fails to boot, there are a number of kernel command line - parameters that may help you to identify or fix the issue. You can - add these parameters in the GRUB boot menu by pressing “e” to modify - the selected boot entry and editing the line starting with - linux. The following are some useful kernel - command line parameters that are recognised by the NixOS boot - scripts or by systemd: - - - - - boot.shell_on_fail - - - - Allows the user to start a root shell if something goes wrong - in stage 1 of the boot process (the initial ramdisk). This is - disabled by default because there is no authentication for the - root shell. - - - - - - boot.debug1 - - - - Start an interactive shell in stage 1 before anything useful - has been done. That is, no modules have been loaded and no - file systems have been mounted, except for - /proc and /sys. - - - - - - boot.debug1devices - - - - Like boot.debug1, but runs stage1 until - kernel modules are loaded and device nodes are created. This - may help with e.g. making the keyboard work. - - - - - - boot.debug1mounts - - - - Like boot.debug1 or - boot.debug1devices, but runs stage1 until - all filesystems that are mounted during initrd are mounted - (see - neededForBoot). - As a motivating example, this could be useful if you’ve - forgotten to set - neededForBoot - on a file system. - - - - - - boot.trace - - - - Print every shell command executed by the stage 1 and 2 boot - scripts. - - - - - - single - - - - Boot into rescue mode (a.k.a. single user mode). This will - cause systemd to start nothing but the unit - rescue.target, which runs - sulogin to prompt for the root password and - start a root login shell. Exiting the shell causes the system - to continue with the normal boot process. - - - - - - systemd.log_level=debug - systemd.log_target=console - - - - Make systemd very verbose and send log messages to the console - instead of the journal. For more parameters recognised by - systemd, see systemd(1). - - - - - - In addition, these arguments are recognised by the live image only: - - - - - live.nixos.passwd=password - - - - Set the password for the nixos live user. - This can be used for SSH access if there are issues using the - terminal. - - - - - - Notice that for boot.shell_on_fail, - boot.debug1, - boot.debug1devices, and - boot.debug1mounts, if you did - not select start the new - shell as pid 1, and you exit from the new - shell, boot will proceed normally from the point where it failed, as - if you’d chosen ignore the error and continue. - - - If no login prompts or X11 login screens appear (e.g. due to hanging - dependencies), you can press Alt+ArrowUp. If you’re lucky, this will - start rescue mode (described above). (Also note that since most - units have a 90-second timeout before systemd gives up on them, the - agetty login prompts should appear eventually - unless something is very wrong.) - -
diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml deleted file mode 100644 index 35dfaf30f457..000000000000 --- a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml +++ /dev/null @@ -1,72 +0,0 @@ - - Cleaning the Nix Store - - Nix has a purely functional model, meaning that packages are never - upgraded in place. Instead new versions of packages end up in a - different location in the Nix store (/nix/store). - You should periodically run Nix’s garbage - collector to remove old, unreferenced packages. This is - easy: - - -$ nix-collect-garbage - - - Alternatively, you can use a systemd unit that does the same in the - background: - - -# systemctl start nix-gc.service - - - You can tell NixOS in configuration.nix to run - this unit automatically at certain points in time, for instance, - every night at 03:15: - - -nix.gc.automatic = true; -nix.gc.dates = "03:15"; - - - The commands above do not remove garbage collector roots, such as - old system configurations. Thus they do not remove the ability to - roll back to previous configurations. The following command deletes - old roots, removing the ability to roll back to them: - - -$ nix-collect-garbage -d - - - You can also do this for specific profiles, e.g. - - -$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old - - - Note that NixOS system configurations are stored in the profile - /nix/var/nix/profiles/system. - - - Another way to reclaim disk space (often as much as 40% of the size - of the Nix store) is to run Nix’s store optimiser, which seeks out - identical files in the store and replaces them with hard links to a - single copy. - - -$ nix-store --optimise - - - Since this command needs to read the entire Nix store, it can take - quite a while to finish. - -
- NixOS Boot Entries - - If your /boot partition runs out of space, - after clearing old profiles you must rebuild your system with - nixos-rebuild boot or - nixos-rebuild switch to update the - /boot partition and clear space. - -
- diff --git a/nixos/doc/manual/from_md/administration/container-networking.section.xml b/nixos/doc/manual/from_md/administration/container-networking.section.xml deleted file mode 100644 index a64053cdfa5e..000000000000 --- a/nixos/doc/manual/from_md/administration/container-networking.section.xml +++ /dev/null @@ -1,54 +0,0 @@ -
- Container Networking - - When you create a container using - nixos-container create, it gets it own private - IPv4 address in the range 10.233.0.0/16. You can - get the container’s IPv4 address as follows: - - -# nixos-container show-ip foo -10.233.4.2 - -$ ping -c1 10.233.4.2 -64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms - - - Networking is implemented using a pair of virtual Ethernet devices. - The network interface in the container is called - eth0, while the matching interface in the host is - called ve-container-name (e.g., - ve-foo). The container has its own network - namespace and the CAP_NET_ADMIN capability, so it - can perform arbitrary network configuration such as setting up - firewall rules, without affecting or having access to the host’s - network. - - - By default, containers cannot talk to the outside network. If you - want that, you should set up Network Address Translation (NAT) rules - on the host to rewrite container traffic to use your external IP - address. This can be accomplished using the following configuration - on the host: - - -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; - - - where eth0 should be replaced with the desired - external interface. Note that ve-+ is a wildcard - that matches all container interfaces. - - - If you are using Network Manager, you need to explicitly prevent it - from managing container interfaces: - - -networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - - You may need to restart your system for the changes to take effect. - -
diff --git a/nixos/doc/manual/from_md/administration/containers.chapter.xml b/nixos/doc/manual/from_md/administration/containers.chapter.xml deleted file mode 100644 index afbd5b35aaa5..000000000000 --- a/nixos/doc/manual/from_md/administration/containers.chapter.xml +++ /dev/null @@ -1,31 +0,0 @@ - - Container Management - - NixOS allows you to easily run other NixOS instances as - containers. Containers are a light-weight - approach to virtualisation that runs software in the container at - the same speed as in the host system. NixOS containers share the Nix - store of the host, making container creation very efficient. - - - - Currently, NixOS containers are not perfectly isolated from the - host system. This means that a user with root access to the - container can do things that affect the host. So you should not - give container root access to untrusted users. - - - - NixOS containers can be created in two ways: imperatively, using the - command nixos-container, and declaratively, by - specifying them in your configuration.nix. The - declarative approach implies that containers get upgraded along with - your host system when you run nixos-rebuild, - which is often not what you want. By contrast, in the imperative - approach, containers are configured and updated independently from - the host system. - - - - - diff --git a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml deleted file mode 100644 index f78c05878031..000000000000 --- a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml +++ /dev/null @@ -1,67 +0,0 @@ - - Control Groups - - To keep track of the processes in a running system, systemd uses - control groups (cgroups). A control group is a - set of processes used to allocate resources such as CPU, memory or - I/O bandwidth. There can be multiple control group hierarchies, - allowing each kind of resource to be managed independently. - - - The command systemd-cgls lists all control groups - in the systemd hierarchy, which is what systemd - uses to keep track of the processes belonging to each service or - user session: - - -$ systemd-cgls -├─user -│ └─eelco -│ └─c1 -│ ├─ 2567 -:0 -│ ├─ 2682 kdeinit4: kdeinit4 Running... -│ ├─ ... -│ └─10851 sh -c less -R -└─system - ├─httpd.service - │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH - │ └─... - ├─dhcpcd.service - │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf - └─ ... - - - Similarly, systemd-cgls cpu shows the cgroups in - the CPU hierarchy, which allows per-cgroup CPU scheduling - priorities. By default, every systemd service gets its own CPU - cgroup, while all user sessions are in the top-level CPU cgroup. - This ensures, for instance, that a thousand run-away processes in - the httpd.service cgroup cannot starve the CPU - for one process in the postgresql.service cgroup. - (By contrast, it they were in the same cgroup, then the PostgreSQL - process would get 1/1001 of the cgroup’s CPU time.) You can limit a - service’s CPU share in configuration.nix: - - -systemd.services.httpd.serviceConfig.CPUShares = 512; - - - By default, every cgroup has 1024 CPU shares, so this will halve the - CPU allocation of the httpd.service cgroup. - - - There also is a memory hierarchy that controls - memory allocation limits; by default, all processes are in the - top-level cgroup, so any service or session can exhaust all - available memory. Per-cgroup memory limits can be specified in - configuration.nix; for instance, to limit - httpd.service to 512 MiB of RAM (excluding swap): - - -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; - - - The command systemd-cgtop shows a continuously - updated list of all cgroups with their CPU and memory usage. - - diff --git a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml deleted file mode 100644 index efc3432ba1a1..000000000000 --- a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml +++ /dev/null @@ -1,60 +0,0 @@ -
- Declarative Container Specification - - You can also specify containers and their configuration in the - host’s configuration.nix. For example, the - following specifies that there shall be a container named - database running PostgreSQL: - - -containers.database = - { config = - { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql_14; - }; - }; - - - If you run nixos-rebuild switch, the container - will be built. If the container was already running, it will be - updated in place, without rebooting. The container can be configured - to start automatically by setting - containers.database.autoStart = true in its - configuration. - - - By default, declarative containers share the network namespace of - the host, meaning that they can listen on (privileged) ports. - However, they cannot change the network configuration. You can give - a container its own network as follows: - - -containers.database = { - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; -}; - - - This gives the container a private virtual Ethernet interface with - IP address 192.168.100.11, which is hooked up to - a virtual Ethernet interface on the host with IP address - 192.168.100.10. (See the next section for details - on container networking.) - - - To disable the container, just remove it from - configuration.nix and run - nixos-rebuild switch. Note that this will not - delete the root directory of the container in - /var/lib/nixos-containers. Containers can be - destroyed using the imperative method: - nixos-container destroy foo. - - - Declarative containers can be started and stopped using the - corresponding systemd service, e.g. - systemctl start container@database. - -
diff --git a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml deleted file mode 100644 index 865fc4689398..000000000000 --- a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml +++ /dev/null @@ -1,132 +0,0 @@ -
- Imperative Container Management - - We’ll cover imperative container management using - nixos-container first. Be aware that container - management is currently only possible as root. - - - You create a container with identifier foo as - follows: - - -# nixos-container create foo - - - This creates the container’s root directory in - /var/lib/nixos-containers/foo and a small - configuration file in - /etc/nixos-containers/foo.conf. It also builds - the container’s initial system configuration and stores it in - /nix/var/nix/profiles/per-container/foo/system. - You can modify the initial configuration of the container on the - command line. For instance, to create a container that has - sshd running, with the given public key for - root: - - -# nixos-container create foo --config ' - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; -' - - - By default the next free address in the - 10.233.0.0/16 subnet will be chosen as container - IP. This behavior can be altered by setting - --host-address and - --local-address: - - -# nixos-container create test --config-file test-container.nix \ - --local-address 10.235.1.2 --host-address 10.235.1.1 - - - Creating a container does not start it. To start the container, run: - - -# nixos-container start foo - - - This command will return as soon as the container has booted and has - reached multi-user.target. On the host, the - container runs within a systemd unit called - container@container-name.service. Thus, if - something went wrong, you can get status info using - systemctl: - - -# systemctl status container@foo - - - If the container has started successfully, you can log in as root - using the root-login operation: - - -# nixos-container root-login foo -[root@foo:~]# - - - Note that only root on the host can do this (since there is no - authentication). You can also get a regular login prompt using the - login operation, which is available to all users - on the host: - - -# nixos-container login foo -foo login: alice -Password: *** - - - With nixos-container run, you can execute - arbitrary commands in the container: - - -# nixos-container run foo -- uname -a -Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - - - There are several ways to change the configuration of the container. - First, on the host, you can edit - /var/lib/container/name/etc/nixos/configuration.nix, - and run - - -# nixos-container update foo - - - This will build and activate the new configuration. You can also - specify a new configuration on the command line: - - -# nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; -' - -# curl http://$(nixos-container show-ip foo)/ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… - - - However, note that this will overwrite the container’s - /etc/nixos/configuration.nix. - - - Alternatively, you can change the configuration from within the - container itself by running nixos-rebuild switch - inside the container. Note that the container by default does not - have a copy of the NixOS channel, so you should run - nix-channel --update first. - - - Containers can be stopped and started using - nixos-container stop and - nixos-container start, respectively, or by using - systemctl on the container’s service unit. To - destroy a container, including its file system, do - - -# nixos-container destroy foo - -
diff --git a/nixos/doc/manual/from_md/administration/logging.chapter.xml b/nixos/doc/manual/from_md/administration/logging.chapter.xml deleted file mode 100644 index 4da38c065a27..000000000000 --- a/nixos/doc/manual/from_md/administration/logging.chapter.xml +++ /dev/null @@ -1,45 +0,0 @@ - - Logging - - System-wide logging is provided by systemd’s - journal, which subsumes traditional logging - daemons such as syslogd and klogd. Log entries are kept in binary - files in /var/log/journal/. The command - journalctl allows you to see the contents of the - journal. For example, - - -$ journalctl -b - - - shows all journal entries since the last reboot. (The output of - journalctl is piped into less - by default.) You can use various options and match operators to - restrict output to messages of interest. For instance, to get all - messages from PostgreSQL: - - -$ journalctl -u postgresql.service --- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -... -Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down --- Reboot -- -Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET -Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - - - Or to get all messages since the last reboot that have at least a - critical severity level: - - -$ journalctl -b -p crit -Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] -Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) - - - The system journal is readable by root and by users in the - wheel and systemd-journal - groups. All users have a private journal that can be read using - journalctl. - - diff --git a/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml b/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml deleted file mode 100644 index c86b1911c117..000000000000 --- a/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml +++ /dev/null @@ -1,14 +0,0 @@ -
- Maintenance Mode - - You can enter rescue mode by running: - - -# systemctl rescue - - - This will eventually give you a single-user root shell. Systemd will - stop (almost) all system services. To get out of maintenance mode, - just exit from the rescue shell. - -
diff --git a/nixos/doc/manual/from_md/administration/network-problems.section.xml b/nixos/doc/manual/from_md/administration/network-problems.section.xml deleted file mode 100644 index 4c0598ca94e8..000000000000 --- a/nixos/doc/manual/from_md/administration/network-problems.section.xml +++ /dev/null @@ -1,25 +0,0 @@ -
- Network Problems - - Nix uses a so-called binary cache to optimise - building a package from source into downloading it as a pre-built - binary. That is, whenever a command like - nixos-rebuild needs a path in the Nix store, Nix - will try to download that path from the Internet rather than build - it from source. The default binary cache is - https://cache.nixos.org/. If this cache is - unreachable, Nix operations may take a long time due to HTTP - connection timeouts. You can disable the use of the binary cache by - adding --option use-binary-caches false, e.g. - - -# nixos-rebuild switch --option use-binary-caches false - - - If you have an alternative binary cache at your disposal, you can - use it instead: - - -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ - -
diff --git a/nixos/doc/manual/from_md/administration/rebooting.chapter.xml b/nixos/doc/manual/from_md/administration/rebooting.chapter.xml deleted file mode 100644 index 78ee75afb642..000000000000 --- a/nixos/doc/manual/from_md/administration/rebooting.chapter.xml +++ /dev/null @@ -1,38 +0,0 @@ - - Rebooting and Shutting Down - - The system can be shut down (and automatically powered off) by - doing: - - -# shutdown - - - This is equivalent to running systemctl poweroff. - - - To reboot the system, run - - -# reboot - - - which is equivalent to systemctl reboot. - Alternatively, you can quickly reboot the system using - kexec, which bypasses the BIOS by directly - loading the new kernel into memory: - - -# systemctl kexec - - - The machine can be suspended to RAM (if supported) using - systemctl suspend, and suspended to disk using - systemctl hibernate. - - - These commands can be run by any user who is logged in locally, i.e. - on a virtual console or in X11; otherwise, the user is asked for - authentication. - - diff --git a/nixos/doc/manual/from_md/administration/rollback.section.xml b/nixos/doc/manual/from_md/administration/rollback.section.xml deleted file mode 100644 index a8df053011c5..000000000000 --- a/nixos/doc/manual/from_md/administration/rollback.section.xml +++ /dev/null @@ -1,42 +0,0 @@ -
- Rolling Back Configuration Changes - - After running nixos-rebuild to switch to a new - configuration, you may find that the new configuration doesn’t work - very well. In that case, there are several ways to return to a - previous configuration. - - - First, the GRUB boot manager allows you to boot into any previous - configuration that hasn’t been garbage-collected. These - configurations can be found under the GRUB submenu NixOS - - All configurations. This is especially useful if the new - configuration fails to boot. After the system has booted, you can - make the selected configuration the default for subsequent boots: - - -# /run/current-system/bin/switch-to-configuration boot - - - Second, you can switch to the previous configuration in a running - system: - - -# nixos-rebuild switch --rollback - - - This is equivalent to running: - - -# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - - - where N is the number of the NixOS system - configuration. To get a list of the available configurations, do: - - -$ ls -l /nix/var/nix/profiles/system-*-link -... -lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 - -
diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml deleted file mode 100644 index 3b7bd6cd30cf..000000000000 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ /dev/null @@ -1,141 +0,0 @@ - - Service Management - - In NixOS, all system services are started and monitored using the - systemd program. systemd is the init process of the - system (i.e. PID 1), the parent of all other processes. It manages a - set of so-called units, which can be things like - system services (programs), but also mount points, swap files, - devices, targets (groups of units) and more. Units can have complex - dependencies; for instance, one unit can require that another unit - must be successfully started before the first unit can be started. - When the system boots, it starts a unit named - default.target; the dependencies of this unit - cause all system services to be started, file systems to be mounted, - swap files to be activated, and so on. - -
- Interacting with a running systemd - - The command systemctl is the main way to - interact with systemd. The following paragraphs - demonstrate ways to interact with any OS running systemd as init - system. NixOS is of no exception. The - next section - explains NixOS specific things worth knowing. - - - Without any arguments, systemctl the status of - active units: - - -$ systemctl --.mount loaded active mounted / -swapfile.swap loaded active active /swapfile -sshd.service loaded active running SSH Daemon -graphical.target loaded active active Graphical Interface -... - - - You can ask for detailed status information about a unit, for - instance, the PostgreSQL database service: - - -$ systemctl status postgresql.service -postgresql.service - PostgreSQL Server - Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) - Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago - Main PID: 2390 (postgres) - CGroup: name=systemd:/system/postgresql.service - ├─2390 postgres - ├─2418 postgres: writer process - ├─2419 postgres: wal writer process - ├─2420 postgres: autovacuum launcher process - ├─2421 postgres: stats collector process - └─2498 postgres: zabbix zabbix [local] idle - -Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET -Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections -Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started -Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - - - Note that this shows the status of the unit (active and running), - all the processes belonging to the service, as well as the most - recent log messages from the service. - - - Units can be stopped, started or restarted: - - -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service - - - These operations are synchronous: they wait until the service has - finished starting or stopping (or has failed). Starting a unit - will cause the dependencies of that unit to be started as well (if - necessary). - -
-
- systemd in NixOS - - Packages in Nixpkgs sometimes provide systemd units with them, - usually in e.g #pkg-out#/lib/systemd/. Putting - such a package in environment.systemPackages - doesn’t make the service available to users or the system. - - - In order to enable a systemd system service - with provided upstream package, use (e.g): - - -systemd.packages = [ pkgs.packagekit ]; - - - Usually NixOS modules written by the community do the above, plus - take care of other details. If a module was written for a service - you are interested in, you’d probably need only to use - services.#name#.enable = true;. These services - are defined in Nixpkgs’ - - nixos/modules/ directory . In case the - service is simple enough, the above method should work, and start - the service on boot. - - - User systemd services on the other hand, - should be treated differently. Given a package that has a systemd - unit file at #pkg-out#/lib/systemd/user/, using - will make you able to - start the service via systemctl --user start, - but it won’t start automatically on login. However, You can - imperatively enable it by adding the package’s attribute to - and then do this (e.g): - - -$ mkdir -p ~/.config/systemd/user/default.target.wants -$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ -$ systemctl --user daemon-reload -$ systemctl --user enable syncthing.service - - - If you are interested in a timer file, use - timers.target.wants instead of - default.target.wants in the 1st and 2nd - command. - - - Using systemctl --user enable syncthing.service - instead of the above, will work, but it’ll use the absolute path - of syncthing.service for the symlink, and this - path is in /nix/store/.../lib/systemd/user/. - Hence garbage collection will - remove that file and you will wind up with a broken symlink in - your systemd configuration, which in turn will not make the - service / timer start on login. - -
- diff --git a/nixos/doc/manual/from_md/administration/store-corruption.section.xml b/nixos/doc/manual/from_md/administration/store-corruption.section.xml deleted file mode 100644 index 9ed572d484dc..000000000000 --- a/nixos/doc/manual/from_md/administration/store-corruption.section.xml +++ /dev/null @@ -1,34 +0,0 @@ -
- Nix Store Corruption - - After a system crash, it’s possible for files in the Nix store to - become corrupted. (For instance, the Ext4 file system has the - tendency to replace un-synced files with zero bytes.) NixOS tries - hard to prevent this from happening: it performs a - sync before switching to a new configuration, and - Nix’s database is fully transactional. If corruption still occurs, - you may be able to fix it automatically. - - - If the corruption is in a path in the closure of the NixOS system - configuration, you can fix it by doing - - -# nixos-rebuild switch --repair - - - This will cause Nix to check every path in the closure, and if its - cryptographic hash differs from the hash recorded in Nix’s database, - the path is rebuilt or redownloaded. - - - You can also scan the entire Nix store for corrupt paths: - - -# nix-store --verify --check-contents --repair - - - Any corrupt paths will be redownloaded if they’re available in a - binary cache; otherwise, they cannot be repaired. - -
diff --git a/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml b/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml deleted file mode 100644 index 8bbb8a1fe729..000000000000 --- a/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml +++ /dev/null @@ -1,12 +0,0 @@ - - Troubleshooting - - This chapter describes solutions to common problems you might - encounter when you manage your NixOS system. - - - - - - - diff --git a/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml b/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml deleted file mode 100644 index e8c64f153fc5..000000000000 --- a/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml +++ /dev/null @@ -1,46 +0,0 @@ - - User Sessions - - Systemd keeps track of all users who are logged into the system - (e.g. on a virtual console or remotely via SSH). The command - loginctl allows querying and manipulating user - sessions. For instance, to list all user sessions: - - -$ loginctl - SESSION UID USER SEAT - c1 500 eelco seat0 - c3 0 root seat0 - c4 500 alice - - - This shows that two users are logged in locally, while another is - logged in remotely. (Seats are essentially the - combinations of displays and input devices attached to the system; - usually, there is only one seat.) To get information about a - session: - - -$ loginctl session-status c3 -c3 - root (0) - Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago - Leader: 2536 (login) - Seat: seat0; vc3 - TTY: /dev/tty3 - Service: login; type tty; class user - State: online - CGroup: name=systemd:/user/root/c3 - ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- - ├─10339 -bash - └─10355 w3m nixos.org - - - This shows that the user is logged in on virtual console 3. It also - lists the processes belonging to this session. Since systemd keeps - track of this, you can terminate a session in a way that ensures - that all the session’s processes are gone: - - -# loginctl terminate-session c3 - - diff --git a/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/nixos/doc/manual/from_md/configuration/abstractions.section.xml deleted file mode 100644 index 469e85979e0f..000000000000 --- a/nixos/doc/manual/from_md/configuration/abstractions.section.xml +++ /dev/null @@ -1,101 +0,0 @@ -
- Abstractions - - If you find yourself repeating yourself over and over, it’s time to - abstract. Take, for instance, this Apache HTTP Server configuration: - - -{ - services.httpd.virtualHosts = - { "blog.example.org" = { - documentRoot = "/webroot/blog.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - "wiki.example.org" = { - documentRoot = "/webroot/wiki.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - }; -} - - - It defines two virtual hosts with nearly identical configuration; - the only difference is the document root directories. To prevent - this duplication, we can use a let: - - -let - commonConfig = - { adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; -in -{ - services.httpd.virtualHosts = - { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); - "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); - }; -} - - - The let commonConfig = ... defines a variable - named commonConfig. The // - operator merges two attribute sets, so the configuration of the - second virtual host is the set commonConfig - extended with the document root option. - - - You can write a let wherever an expression is - allowed. Thus, you also could have written: - - -{ - services.httpd.virtualHosts = - let commonConfig = ...; in - { "blog.example.org" = (commonConfig // { ... }) - "wiki.example.org" = (commonConfig // { ... }) - }; -} - - - but not { let commonConfig = ...; in ...; } since - attributes (as opposed to attribute values) are not expressions. - - - Functions provide another method - of abstraction. For instance, suppose that we want to generate lots - of different virtual hosts, all with identical configuration except - for the document root. This can be done as follows: - - -{ - services.httpd.virtualHosts = - let - makeVirtualHost = webroot: - { documentRoot = webroot; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; - in - { "example.org" = (makeVirtualHost "/webroot/example.org"); - "example.com" = (makeVirtualHost "/webroot/example.com"); - "example.gov" = (makeVirtualHost "/webroot/example.gov"); - "example.nl" = (makeVirtualHost "/webroot/example.nl"); - }; -} - - - Here, makeVirtualHost is a function that takes a - single argument webroot and returns the - configuration for a virtual host. That function is then called for - several names to produce the list of virtual host configurations. - -
diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml deleted file mode 100644 index 516022dc16d2..000000000000 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml +++ /dev/null @@ -1,16 +0,0 @@ -
- Ad-Hoc Configuration - - You can use to - specify shell commands to be run at the end of - network-setup.service. This is useful for doing - network configuration not covered by the existing NixOS modules. For - instance, to statically configure an IPv6 address: - - -networking.localCommands = - '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 - ''; - -
diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml deleted file mode 100644 index c9a8d4f3f106..000000000000 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml +++ /dev/null @@ -1,59 +0,0 @@ -
- Ad-Hoc Package Management - - With the command nix-env, you can install and - uninstall packages from the command line. For instance, to install - Mozilla Thunderbird: - - -$ nix-env -iA nixos.thunderbird - - - If you invoke this as root, the package is installed in the Nix - profile /nix/var/nix/profiles/default and visible - to all users of the system; otherwise, the package ends up in - /nix/var/nix/profiles/per-user/username/profile - and is not visible to other users. The -A flag - specifies the package by its attribute name; without it, the package - is installed by matching against its package name (e.g. - thunderbird). The latter is slower because it - requires matching against all available Nix packages, and is - ambiguous if there are multiple matching packages. - - - Packages come from the NixOS channel. You typically upgrade a - package by updating to the latest version of the NixOS channel: - - -$ nix-channel --update nixos - - - and then running nix-env -i again. Other packages - in the profile are not affected; this is the - crucial difference with the declarative style of package management, - where running nixos-rebuild switch causes all - packages to be updated to their current versions in the NixOS - channel. You can however upgrade all packages for which there is a - newer version by doing: - - -$ nix-env -u '*' - - - A package can be uninstalled using the -e flag: - - -$ nix-env -e thunderbird - - - Finally, you can roll back an undesirable nix-env - action: - - -$ nix-env --rollback - - - nix-env has many more flags. For details, see the - nix-env(1) manpage or the Nix manual. - -
diff --git a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml deleted file mode 100644 index b1a1a8df3247..000000000000 --- a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml +++ /dev/null @@ -1,118 +0,0 @@ -
- Adding Custom Packages - - It’s possible that a package you need is not available in NixOS. In - that case, you can do two things. Either you can package it with - Nix, or you can try to use prebuilt packages from upstream. Due to - the peculiarities of NixOS, it is important to note that building - software from source is often easier than using pre-built - executables. - -
- Building with Nix - - This can be done either in-tree or out-of-tree. For an in-tree - build, you can clone the Nixpkgs repository, add the package to - your clone, and (optionally) submit a patch or pull request to - have it accepted into the main Nixpkgs repository. This is - described in detail in the - Nixpkgs - manual. In short, you clone Nixpkgs: - - -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs - - - Then you write and test the package as described in the Nixpkgs - manual. Finally, you add it to - , e.g. - - -environment.systemPackages = [ pkgs.my-package ]; - - - and you run nixos-rebuild, specifying your own - Nixpkgs tree: - - -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs - - - The second possibility is to add the package outside of the - Nixpkgs tree. For instance, here is how you specify a build of the - GNU - Hello package directly in - configuration.nix: - - -environment.systemPackages = - let - my-hello = with pkgs; stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; - }; - in - [ my-hello ]; - - - Of course, you can also move the definition of - my-hello into a separate Nix expression, e.g. - - -environment.systemPackages = [ (import ./my-hello.nix) ]; - - - where my-hello.nix contains: - - -with import <nixpkgs> {}; # bring all of Nixpkgs into scope - -stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; -} - - - This allows testing the package easily: - - -$ nix-build my-hello.nix -$ ./result/bin/hello -Hello, world! - -
-
- Using pre-built executables - - Most pre-built executables will not work on NixOS. There are two - notable exceptions: flatpaks and AppImages. For flatpaks see the - dedicated section. - AppImages will not run as-is on NixOS. First you - need to install appimage-run: add to - /etc/nixos/configuration.nix - - -environment.systemPackages = [ pkgs.appimage-run ]; - - - Then instead of running the AppImage as-is, run - appimage-run foo.appimage. - - - To make other pre-built executables work on NixOS, you need to - package them with Nix and special helpers like - autoPatchelfHook or - buildFHSUserEnv. See the - Nixpkgs - manual for details. This is complex and often doing a - source build is easier. - -
-
diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml deleted file mode 100644 index da5419cde4d3..000000000000 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ /dev/null @@ -1,231 +0,0 @@ -
- NixOS Configuration File - - The NixOS configuration file generally looks like this: - - -{ config, pkgs, ... }: - -{ option definitions -} - - - The first line ({ config, pkgs, ... }:) denotes - that this is actually a function that takes at least the two - arguments config and pkgs. - (These are explained later, in chapter - ) The function returns a - set of option definitions - ({ ... }). These definitions have the form - name = value, where name is - the name of an option and value is its value. For - example, - - -{ config, pkgs, ... }: - -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; -} - - - defines a configuration with three option definitions that together - enable the Apache HTTP Server with /webroot as - the document root. - - - Sets can be nested, and in fact dots in option names are shorthand - for defining a set containing another set. For instance, - defines a set named - services that contains a set named - httpd, which in turn contains an option - definition named enable with value - true. This means that the example above can also - be written as: - - -{ config, pkgs, ... }: - -{ services = { - httpd = { - enable = true; - adminAddr = "alice@example.org"; - virtualHosts = { - localhost = { - documentRoot = "/webroot"; - }; - }; - }; - }; -} - - - which may be more convenient if you have lots of option definitions - that share the same prefix (such as - services.httpd). - - - NixOS checks your option definitions for correctness. For instance, - if you try to define an option that doesn’t exist (that is, doesn’t - have a corresponding option declaration), - nixos-rebuild will give an error like: - - -The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. - - - Likewise, values in option definitions must have a correct type. For - instance, services.httpd.enable must be a Boolean - (true or false). Trying to - give it a value of another type, such as a string, will cause an - error: - - -The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. - - - Options have various types of values. The most important are: - - - - - Strings - - - - Strings are enclosed in double quotes, e.g. - - -networking.hostName = "dexter"; - - - Special characters can be escaped by prefixing them with a - backslash (e.g. \"). - - - Multi-line strings can be enclosed in double single - quotes, e.g. - - -networking.extraHosts = - '' - 127.0.0.2 other-localhost - 10.0.0.1 server - ''; - - - The main difference is that it strips from each line a number - of spaces equal to the minimal indentation of the string as a - whole (disregarding the indentation of empty lines), and that - characters like " and - \ are not special (making it more - convenient for including things like shell code). See more - info about this in the Nix manual - here. - - - - - - Booleans - - - - These can be true or - false, e.g. - - -networking.firewall.enable = true; -networking.firewall.allowPing = false; - - - - - - Integers - - - - For example, - - -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; - - - (Note that here the attribute name - net.ipv4.tcp_keepalive_time is enclosed in - quotes to prevent it from being interpreted as a set named - net containing a set named - ipv4, and so on. This is because it’s not a - NixOS option but the literal name of a Linux kernel setting.) - - - - - - Sets - - - - Sets were introduced above. They are name/value pairs enclosed - in braces, as in the option definition - - -fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - options = [ "rw" "data=ordered" "relatime" ]; - }; - - - - - - Lists - - - - The important thing to note about lists is that list elements - are separated by whitespace, like this: - - -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; - - - List elements can be any other type, e.g. sets: - - -swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - - - - - - Packages - - - - Usually, the packages you need are already part of the Nix - Packages collection, which is a set that can be accessed - through the function argument pkgs. Typical - uses: - - -environment.systemPackages = - [ pkgs.thunderbird - pkgs.emacs - ]; - -services.postgresql.package = pkgs.postgresql_14; - - - The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 14.x. For more - information on packages, including how to add new ones, see - . - - - - -
diff --git a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml b/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml deleted file mode 100644 index baf9639554cc..000000000000 --- a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml +++ /dev/null @@ -1,20 +0,0 @@ - - Configuration Syntax - - The NixOS configuration file - /etc/nixos/configuration.nix is actually a - Nix expression, which is the Nix package - manager’s purely functional language for describing how to build - packages and configurations. This means you have all the expressive - power of that language at your disposal, including the ability to - abstract over common patterns, which is very useful when managing - complex systems. The syntax and semantics of the Nix language are - fully described in the - Nix - manual, but here we give a short overview of the most - important constructs useful in NixOS configuration files. - - - - - diff --git a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml deleted file mode 100644 index 8026c4102b48..000000000000 --- a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml +++ /dev/null @@ -1,90 +0,0 @@ -
- Customising Packages - - Some packages in Nixpkgs have options to enable or disable optional - functionality or change other aspects of the package. For instance, - the Firefox wrapper package (which provides Firefox with a set of - plugins such as the Adobe Flash player) has an option to enable the - Google Talk plugin. It can be set in - configuration.nix as follows: - nixpkgs.config.firefox.enableGoogleTalkPlugin = true; - - - - Unfortunately, Nixpkgs currently lacks a way to query available - configuration options. - - - - Apart from high-level options, it’s possible to tweak a package in - almost arbitrary ways, such as changing or disabling dependencies of - a package. For instance, the Emacs package in Nixpkgs by default has - a dependency on GTK 2. If you want to build it against GTK 3, you - can specify that as follows: - - -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; - - - The function override performs the call to the - Nix function that produces Emacs, with the original arguments - amended by the set of arguments specified by you. So here the - function argument gtk gets the value - pkgs.gtk3, causing Emacs to depend on GTK 3. (The - parentheses are necessary because in Nix, function application binds - more weakly than list construction, so without them, - would be a list - with two elements.) - - - Even greater customisation is possible using the function - overrideAttrs. While the - override mechanism above overrides the arguments - of a package function, overrideAttrs allows - changing the attributes passed to - mkDerivation. This permits changing any aspect of - the package, such as the source code. For instance, if you want to - override the source code of Emacs, you can say: - - -environment.systemPackages = [ - (pkgs.emacs.overrideAttrs (oldAttrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) -]; - - - Here, overrideAttrs takes the Nix derivation - specified by pkgs.emacs and produces a new - derivation in which the original’s name and - src attribute have been replaced by the given - values by re-calling stdenv.mkDerivation. The - original attributes are accessible via the function argument, which - is conventionally named oldAttrs. - - - The overrides shown above are not global. They do not affect the - original package; other packages in Nixpkgs continue to depend on - the original rather than the customised package. This means that if - another package in your system depends on the original package, you - end up with two instances of the package. If you want to have - everything depend on your customised instance, you can apply a - global override as follows: - - -nixpkgs.config.packageOverrides = pkgs: - { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; - }; - - - The effect of this definition is essentially equivalent to modifying - the emacs attribute in the Nixpkgs source tree. - Any package in Nixpkgs that depends on emacs will - be passed your customised instance. (However, the value - pkgs.emacs in - nixpkgs.config.packageOverrides refers to the - original rather than overridden instance, to prevent an infinite - recursion.) - -
diff --git a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml b/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml deleted file mode 100644 index bee310c2e34b..000000000000 --- a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml +++ /dev/null @@ -1,53 +0,0 @@ -
- Declarative Package Management - - With declarative package management, you specify which packages you - want on your system by setting the option - . For instance, - adding the following line to configuration.nix - enables the Mozilla Thunderbird email application: - - -environment.systemPackages = [ pkgs.thunderbird ]; - - - The effect of this specification is that the Thunderbird package - from Nixpkgs will be built or downloaded as part of the system when - you run nixos-rebuild switch. - - - - Some packages require additional global configuration such as - D-Bus or systemd service registration so adding them to - might not be - sufficient. You are advised to check the - list of options whether a NixOS - module for the package does not exist. - - - - You can get a list of the available packages as follows: - - -$ nix-env -qaP '*' --description -nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded -... - - - The first column in the output is the attribute - name, such as nixos.thunderbird. - - - Note: the nixos prefix tells us that we want to - get the package from the nixos channel and works - only in CLI tools. In declarative configuration use - pkgs prefix (variable). - - - To uninstall a package, simply remove it from - and run - nixos-rebuild switch. - - - -
diff --git a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml b/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml deleted file mode 100644 index e5285c797555..000000000000 --- a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml +++ /dev/null @@ -1,55 +0,0 @@ - - File Systems - - You can define file systems using the fileSystems - configuration option. For instance, the following definition causes - NixOS to mount the Ext4 file system on device - /dev/disk/by-label/data onto the mount point - /data: - - -fileSystems."/data" = - { device = "/dev/disk/by-label/data"; - fsType = "ext4"; - }; - - - This will create an entry in /etc/fstab, which - will generate a corresponding - systemd.mount - unit via - systemd-fstab-generator. - The filesystem will be mounted automatically unless - "noauto" is present in - options. - "noauto" filesystems can be mounted - explicitly using systemctl e.g. - systemctl start data.mount. Mount points are - created automatically if they don’t already exist. For - device, it’s best to use the topology-independent - device aliases in /dev/disk/by-label and - /dev/disk/by-uuid, as these don’t change if the - topology changes (e.g. if a disk is moved to another IDE - controller). - - - You can usually omit the file system type - (fsType), since mount can - usually detect the type and load the necessary kernel module - automatically. However, if the file system is needed at early boot - (in the initial ramdisk) and is not ext2, - ext3 or ext4, then it’s best - to specify fsType to ensure that the kernel - module is available. - - - - System startup will fail if any of the filesystems fails to mount, - dropping you to the emergency shell. You can make a mount - asynchronous and non-critical by adding - options = [ "nofail" ];. - - - - - diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml deleted file mode 100644 index 6e1ffab72c54..000000000000 --- a/nixos/doc/manual/from_md/configuration/firewall.section.xml +++ /dev/null @@ -1,39 +0,0 @@ -
- Firewall - - NixOS has a simple stateful firewall that blocks incoming - connections and other unexpected packets. The firewall applies to - both IPv4 and IPv6 traffic. It is enabled by default. It can be - disabled as follows: - - -networking.firewall.enable = false; - - - If the firewall is enabled, you can open specific TCP ports to the - outside world: - - -networking.firewall.allowedTCPPorts = [ 80 443 ]; - - - Note that TCP port 22 (ssh) is opened automatically if the SSH - daemon is enabled - (services.openssh.enable = true). UDP ports can - be opened through - . - - - To open ranges of TCP ports: - - -networking.firewall.allowedTCPPortRanges = [ - { from = 4000; to = 4007; } - { from = 8000; to = 8010; } -]; - - - Similarly, UDP port ranges can be opened through - . - -
diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml deleted file mode 100644 index c95d3dc86525..000000000000 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ /dev/null @@ -1,281 +0,0 @@ - - GPU acceleration - - NixOS provides various APIs that benefit from GPU hardware - acceleration, such as VA-API and VDPAU for video playback; OpenGL - and Vulkan for 3D graphics; and OpenCL for general-purpose - computing. This chapter describes how to set up GPU hardware - acceleration (as far as this is not done automatically) and how to - verify that hardware acceleration is indeed used. - - - Most of the aforementioned APIs are agnostic with regards to which - display server is used. Consequently, these instructions should - apply both to the X Window System and Wayland compositors. - -
- OpenCL - - OpenCL - is a general compute API. It is used by various applications such - as Blender and Darktable to accelerate certain operations. - - - OpenCL applications load drivers through the Installable - Client Driver (ICD) mechanism. In this mechanism, an - ICD file specifies the path to the OpenCL driver for a particular - GPU family. In NixOS, there are two ways to make ICD files visible - to the ICD loader. The first is through the - OCL_ICD_VENDORS environment variable. This - variable can contain a directory which is scanned by the ICL - loader for ICD files. For example: - - -$ export \ - OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ - - - The second mechanism is to add the OpenCL driver package to - . This links - the ICD file under /run/opengl-driver, where it - will be visible to the ICD loader. - - - The proper installation of OpenCL drivers can be verified through - the clinfo command of the clinfo package. This - command will report the number of hardware devices that is found - and give detailed information for each device: - - -$ clinfo | head -n3 -Number of platforms 1 -Platform Name AMD Accelerated Parallel Processing -Platform Vendor Advanced Micro Devices, Inc. - -
- AMD - - Modern AMD - Graphics - Core Next (GCN) GPUs are supported through the - rocm-opencl-icd package. Adding this package to - enables - OpenCL support: - - -hardware.opengl.extraPackages = [ - rocm-opencl-icd -]; - -
-
- Intel - - Intel - Gen8 and later GPUs are supported by the Intel NEO OpenCL - runtime that is provided by the intel-compute-runtime package. - For Gen7 GPUs, the deprecated Beignet runtime can be used, which - is provided by the beignet package. The proprietary Intel OpenCL - runtime, in the intel-ocl package, is an alternative for Gen7 - GPUs. - - - The intel-compute-runtime, beignet, or intel-ocl package can be - added to to - enable OpenCL support. For example, for Gen8 and later GPUs, the - following configuration can be used: - - -hardware.opengl.extraPackages = [ - intel-compute-runtime -]; - -
-
-
- Vulkan - - Vulkan - is a graphics and compute API for GPUs. It is used directly by - games or indirectly though compatibility layers like - DXVK. - - - By default, if - is enabled, mesa is installed and provides Vulkan for supported - hardware. - - - Similar to OpenCL, Vulkan drivers are loaded through the - Installable Client Driver (ICD) mechanism. - ICD files for Vulkan are JSON files that specify the path to the - driver library and the supported Vulkan version. All successfully - loaded drivers are exposed to the application as different GPUs. - In NixOS, there are two ways to make ICD files visible to Vulkan - applications: an environment variable and a module option. - - - The first option is through the - VK_ICD_FILENAMES environment variable. This - variable can contain multiple JSON files, separated by - :. For example: - - -$ export \ - VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json - - - The second mechanism is to add the Vulkan driver package to - . This links - the ICD file under /run/opengl-driver, where it - will be visible to the ICD loader. - - - The proper installation of Vulkan drivers can be verified through - the vulkaninfo command of the vulkan-tools - package. This command will report the hardware devices and drivers - found, in this example output amdvlk and radv: - - -$ vulkaninfo | grep GPU - GPU id : 0 (Unknown AMD GPU) - GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) - ... -GPU0: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - deviceName = Unknown AMD GPU -GPU1: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - - - A simple graphical application that uses Vulkan is - vkcube from the vulkan-tools package. - -
- AMD - - Modern AMD - Graphics - Core Next (GCN) GPUs are supported through either radv, - which is part of mesa, or the amdvlk package. Adding the amdvlk - package to - makes amdvlk the default driver and hides radv and lavapipe from - the device list. A specific driver can be forced as follows: - - -hardware.opengl.extraPackages = [ - pkgs.amdvlk -]; - -# To enable Vulkan support for 32-bit applications, also add: -hardware.opengl.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk -]; - -# Force radv -environment.variables.AMD_VULKAN_ICD = "RADV"; -# Or -environment.variables.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - -
-
-
- VA-API - - VA-API - (Video Acceleration API) is an open-source library and API - specification, which provides access to graphics hardware - acceleration capabilities for video processing. - - - VA-API drivers are loaded by libva. The version - in nixpkgs is built to search the opengl driver path, so drivers - can be installed in - . - - - VA-API can be tested using: - - -$ nix-shell -p libva-utils --run vainfo - -
- Intel - - Modern Intel GPUs use the iHD driver, which can be installed - with: - - -hardware.opengl.extraPackages = [ - intel-media-driver -]; - - - Older Intel GPUs use the i965 driver, which can be installed - with: - - -hardware.opengl.extraPackages = [ - vaapiIntel -]; - -
-
-
- Common issues -
- User permissions - - Except where noted explicitly, it should not be necessary to - adjust user permissions to use these acceleration APIs. In the - default configuration, GPU devices have world-read/write - permissions (/dev/dri/renderD*) or are tagged - as uaccess - (/dev/dri/card*). The access control lists of - devices with the uaccess tag will be updated - automatically when a user logs in through - systemd-logind. For example, if the user - alice is logged in, the access control list - should look as follows: - - -$ getfacl /dev/dri/card0 -# file: dev/dri/card0 -# owner: root -# group: video -user::rw- -user:alice:rw- -group::rw- -mask::rw- -other::--- - - - If you disabled (this functionality of) - systemd-logind, you may need to add the user - to the video group and log in again. - -
-
- Mixing different versions of nixpkgs - - The Installable Client Driver (ICD) - mechanism used by OpenCL and Vulkan loads runtimes into its - address space using dlopen. Mixing an ICD - loader mechanism and runtimes from different version of nixpkgs - may not work. For example, if the ICD loader uses an older - version of glibc than the runtime, the runtime may not be - loadable due to missing symbols. Unfortunately, the loader will - generally be quiet about such issues. - - - If you suspect that you are running into library version - mismatches between an ICL loader and a runtime, you could run an - application with the LD_DEBUG variable set to - get more diagnostic information. For example, OpenCL can be - tested with LD_DEBUG=files clinfo, which - should report missing symbols. - -
-
- diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml deleted file mode 100644 index 49ec6f5952ec..000000000000 --- a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml +++ /dev/null @@ -1,43 +0,0 @@ -
- IPv4 Configuration - - By default, NixOS uses DHCP (specifically, - dhcpcd) to automatically configure network - interfaces. However, you can configure an interface manually as - follows: - - -networking.interfaces.eth0.ipv4.addresses = [ { - address = "192.168.1.2"; - prefixLength = 24; -} ]; - - - Typically you’ll also want to set a default gateway and set of name - servers: - - -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; - - - - Statically configured interfaces are set up by the systemd service - interface-name-cfg.service. The default gateway - and name server configuration is performed by - network-setup.service. - - - - The host name is set using - : - - -networking.hostName = "cartman"; - - - The default host name is nixos. Set it to the - empty string ("") to allow the DHCP - server to provide the host name. - -
diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml deleted file mode 100644 index 2adb10622624..000000000000 --- a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml +++ /dev/null @@ -1,47 +0,0 @@ -
- IPv6 Configuration - - IPv6 is enabled by default. Stateless address autoconfiguration is - used to automatically assign IPv6 addresses to all interfaces, and - Privacy Extensions (RFC 4946) are enabled by default. You can adjust - the default for this by setting - . This option may be - overridden on a per-interface basis by - . You - can disable IPv6 support globally by setting: - - -networking.enableIPv6 = false; - - - You can disable IPv6 on a single interface using a normal sysctl (in - this example, we use interface eth0): - - -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; - - - As with IPv4 networking interfaces are automatically configured via - DHCPv6. You can configure an interface manually: - - -networking.interfaces.eth0.ipv6.addresses = [ { - address = "fe00:aa:bb:cc::2"; - prefixLength = 64; -} ]; - - - For configuring a gateway, optionally with explicitly specified - interface: - - -networking.defaultGateway6 = { - address = "fe00::1"; - interface = "enp0s3"; -}; - - - See for similar examples and additional - information. - -
diff --git a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml deleted file mode 100644 index da9ba323f18c..000000000000 --- a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml +++ /dev/null @@ -1,115 +0,0 @@ - - Kubernetes - - The NixOS Kubernetes module is a collective term for a handful of - individual submodules implementing the Kubernetes cluster - components. - - - There are generally two ways of enabling Kubernetes on NixOS. One - way is to enable and configure cluster components appropriately by - hand: - - -services.kubernetes = { - apiserver.enable = true; - controllerManager.enable = true; - scheduler.enable = true; - addonManager.enable = true; - proxy.enable = true; - flannel.enable = true; -}; - - - Another way is to assign cluster roles (master and/or - node) to the host. This enables apiserver, - controllerManager, scheduler, addonManager, kube-proxy and etcd: - - -services.kubernetes.roles = [ "master" ]; - - - While this will enable the kubelet and kube-proxy only: - - -services.kubernetes.roles = [ "node" ]; - - - Assigning both the master and node roles is usable if you want a - single node Kubernetes cluster for dev or testing purposes: - - -services.kubernetes.roles = [ "master" "node" ]; - - - Note: Assigning either role will also default both - and - to true. This - sets up flannel as CNI and activates automatic PKI bootstrapping. - - - - As of NixOS 19.03, it is mandatory to configure: - . The - masterAddress must be resolveable and routeable by all cluster - nodes. In single node clusters, this can be set to - localhost. - - - - Role-based access control (RBAC) authorization mode is enabled by - default. This means that anonymous requests to the apiserver secure - port will expectedly cause a permission denied error. All cluster - components must therefore be configured with x509 certificates for - two-way tls communication. The x509 certificate subject section - determines the roles and permissions granted by the apiserver to - perform clusterwide or namespaced operations. See also: - - Using RBAC Authorization. - - - The NixOS kubernetes module provides an option for automatic - certificate bootstrapping and configuration, - . The PKI - bootstrapping process involves setting up a certificate authority - (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a - CA-cert for the cluster, and uses the CA-cert for signing - subordinate certs issued to each of the cluster components. - Subsequently, the certmgr daemon monitors active certificates and - renews them when needed. For single node Kubernetes clusters, - setting = true - is sufficient and no further action is required. For joining extra - node machines to an existing cluster on the other hand, establishing - initial trust is mandatory. - - - To add new nodes to the cluster: On any (non-master) cluster node - where is - enabled, the helper script - nixos-kubernetes-node-join is available on PATH. - Given a token on stdin, it will copy the token to the kubernetes - secrets directory and restart the certmgr service. As requested - certificates are issued, the script will restart kubernetes cluster - components as needed for them to pick up new keypairs. - - - - Multi-master (HA) clusters are not supported by the easyCerts - module. - - - - In order to interact with an RBAC-enabled cluster as an - administrator, one needs to have cluster-admin privileges. By - default, when easyCerts is enabled, a cluster-admin kubeconfig file - is generated and linked into - /etc/kubernetes/cluster-admin.kubeconfig as - determined by - . - export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig - will make kubectl use this kubeconfig to access and authenticate the - cluster. The cluster-admin kubeconfig references an auto-generated - keypair owned by root. Thus, only root on the kubernetes master may - obtain cluster-admin rights by means of this file. - - diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml deleted file mode 100644 index f889306d51c0..000000000000 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ /dev/null @@ -1,221 +0,0 @@ - - Linux Kernel - - You can override the Linux kernel and associated packages using the - option boot.kernelPackages. For instance, this - selects the Linux 3.10 kernel: - - -boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; - - - Note that this not only replaces the kernel, but also packages that - are specific to the kernel version, such as the NVIDIA video - drivers. This ensures that driver packages are consistent with the - kernel. - - - While pkgs.linuxKernel.packages contains all - available kernel packages, you may want to use one of the - unversioned pkgs.linuxPackages_* aliases such as - pkgs.linuxPackages_latest, that are kept up to - date with new versions. - - - Please note that the current convention in NixOS is to only keep - actively maintained kernel versions on both unstable and the - currently supported stable release(s) of NixOS. This means that a - non-longterm kernel will be removed after it’s abandoned by the - kernel developers, even on stable NixOS versions. If you pin your - kernel onto a non-longterm version, expect your evaluation to fail - as soon as the version is out of maintenance. - - - Longterm versions of kernels will be removed before the next stable - NixOS that will exceed the maintenance period of the kernel version. - - - The default Linux kernel configuration should be fine for most - users. You can see the configuration of your current kernel with the - following command: - - -zcat /proc/config.gz - - - If you want to change the kernel configuration, you can use the - packageOverrides feature (see - ). For instance, to - enable support for the kernel debugger KGDB: - - -nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { - linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { - extraConfig = '' - KGDB y - ''; - }; -}; - - - extraConfig takes a list of Linux kernel - configuration options, one per line. The name of the option should - not include the prefix CONFIG_. The option value - is typically y, n or - m (to build something as a kernel module). - - - Kernel modules for hardware devices are generally loaded - automatically by udev. You can force a module to - be loaded via , e.g. - - -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; - - - If the module is required early during the boot (e.g. to mount the - root file system), you can use - : - - -boot.initrd.kernelModules = [ "cifs" ]; - - - This causes the specified modules and their dependencies to be added - to the initial ramdisk. - - - Kernel runtime parameters can be set through - , e.g. - - -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; - - - sets the kernel’s TCP keepalive time to 120 seconds. To see the - available parameters, run sysctl -a. - -
- Building a custom kernel - - You can customize the default kernel configuration by overriding - the arguments for your kernel package: - - -pkgs.linux_latest.override { - ignoreConfigErrors = true; - autoModules = false; - kernelPreferBuiltin = true; - extraStructuredConfig = with lib.kernel; { - DEBUG_KERNEL = yes; - FRAME_POINTER = yes; - KGDB = yes; - KGDB_SERIAL_CONSOLE = yes; - DEBUG_INFO = yes; - }; -} - - - See pkgs/os-specific/linux/kernel/generic.nix - for details on how these arguments affect the generated - configuration. You can also build a custom version of Linux by - calling pkgs.buildLinux directly, which - requires the src and version - arguments to be specified. - - - To use your custom kernel package in your NixOS configuration, set - - -boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; - - - Note that this method will use the common configuration defined in - pkgs/os-specific/linux/kernel/common-config.nix, - which is suitable for a NixOS system. - - - If you already have a generated configuration file, you can build - a kernel that uses it with - pkgs.linuxManualConfig: - - -let - baseKernel = pkgs.linux_latest; -in pkgs.linuxManualConfig { - inherit (baseKernel) src modDirVersion; - version = "${baseKernel.version}-custom"; - configfile = ./my_kernel_config; - allowImportFromDerivation = true; -} - - - - The build will fail if modDirVersion does not - match the source’s kernel.release file, so - modDirVersion should remain tied to - src. - - - - To edit the .config file for Linux X.Y, proceed - as follows: - - -$ nix-shell '<nixpkgs>' -A linuxKernel.kernels.linux_X_Y.configEnv -$ unpackPhase -$ cd linux-* -$ make nconfig - -
-
- Developing kernel modules - - When developing kernel modules it’s often convenient to run - edit-compile-run loop as quickly as possible. See below snippet as - an example of developing mellanox drivers. - - -$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev -$ nix-shell '<nixpkgs>' -A linuxPackages.kernel -$ unpackPhase -$ cd linux-* -$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko - -
-
- ZFS - - It’s a common issue that the latest stable version of ZFS doesn’t - support the latest available Linux kernel. It is recommended to - use the latest available LTS that’s compatible with ZFS. Usually - this is the default kernel provided by nixpkgs (i.e. - pkgs.linuxPackages). - - - Alternatively, it’s possible to pin the system to the latest - available kernel version that is supported by - ZFS like this: - - -{ - boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; -} - - - Please note that the version this attribute points to isn’t - monotonic because the latest kernel version only refers to kernel - versions supported by the Linux developers. In other words, the - latest kernel version that ZFS is compatible with may decrease - over time. - - - An example: the latest version ZFS is compatible with is 5.19 - which is a non-longterm version. When 5.19 is out of maintenance, - the latest supported kernel version is 5.15 because it’s longterm - and the versions 5.16, 5.17 and 5.18 are already out of - maintenance because they’re non-longterm. - -
- diff --git a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml deleted file mode 100644 index 144a5acecae3..000000000000 --- a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml +++ /dev/null @@ -1,84 +0,0 @@ -
- LUKS-Encrypted File Systems - - NixOS supports file systems that are encrypted using - LUKS (Linux Unified Key Setup). For example, - here is how you create an encrypted Ext4 file system on the device - /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: - - -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d - -WARNING! -======== -This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. - -Are you sure? (Type uppercase yes): YES -Enter LUKS passphrase: *** -Verify passphrase: *** - -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted -Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** - -# mkfs.ext4 /dev/mapper/crypted - - - The LUKS volume should be automatically picked up by - nixos-generate-config, but you might want to - verify that your hardware-configuration.nix looks - correct. To manually ensure that the system is automatically mounted - at boot time as /, add the following to - configuration.nix: - - -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; - - - Should grub be used as bootloader, and /boot is - located on an encrypted partition, it is necessary to add the - following grub option: - - -boot.loader.grub.enableCryptodisk = true; - -
- FIDO2 - - NixOS also supports unlocking your LUKS-Encrypted file system - using a FIDO2 compatible token. In the following example, we will - create a new FIDO2 credential and add it as a new key to our - existing device /dev/sda2: - - -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" -f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 - -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -Password: -Password (again): -Old password: -Old password (again): -Added to key to device /dev/sda2, slot: 2 - - - To ensure that this file system is decrypted using the FIDO2 - compatible key, add the following to - configuration.nix: - - -boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; - - - You can also use the FIDO2 passwordless setup, but for security - reasons, you might want to enable it only when your device is PIN - protected, such as - Trezor. - - -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; - -
-
diff --git a/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixos/doc/manual/from_md/configuration/modularity.section.xml deleted file mode 100644 index 987b2fc43c01..000000000000 --- a/nixos/doc/manual/from_md/configuration/modularity.section.xml +++ /dev/null @@ -1,152 +0,0 @@ -
- Modularity - - The NixOS configuration mechanism is modular. If your - configuration.nix becomes too big, you can split - it into multiple files. Likewise, if you have multiple NixOS - configurations (e.g. for different computers) with some commonality, - you can move the common configuration into a shared file. - - - Modules have exactly the same syntax as - configuration.nix. In fact, - configuration.nix is itself a module. You can use - other modules by including them from - configuration.nix, e.g.: - - -{ config, pkgs, ... }: - -{ imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; - ... -} - - - Here, we include two modules from the same directory, - vpn.nix and kde.nix. The - latter might look like this: - - -{ config, pkgs, ... }: - -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - environment.systemPackages = [ pkgs.vim ]; -} - - - Note that both configuration.nix and - kde.nix define the option - . When multiple - modules define an option, NixOS will try to - merge the definitions. In the case of - , that’s easy: the - lists of packages can simply be concatenated. The value in - configuration.nix is merged last, so for - list-type options, it will appear at the end of the merged list. If - you want it to appear first, you can use - mkBefore: - - -boot.kernelModules = mkBefore [ "kvm-intel" ]; - - - This causes the kvm-intel kernel module to be - loaded before any other kernel modules. - - - For other types of options, a merge may not be possible. For - instance, if two modules define - , - nixos-rebuild will give an error: - - -The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. - - - When that happens, it’s possible to force one definition take - precedence over the others: - - -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; - - - When using multiple modules, you may need to access configuration - values defined in other modules. This is what the - config function argument is for: it contains the - complete, merged system configuration. That is, - config is the result of combining the - configurations returned by every module - - If you’re wondering how it’s possible that the (indirect) - result of a function is passed as an - input to that same function: that’s because - Nix is a lazy language — it only computes values - when they are needed. This works as long as no individual - configuration value depends on itself. - - . For example, here is a module that adds some packages - to only if - is set to - true somewhere else: - - -{ config, pkgs, ... }: - -{ environment.systemPackages = - if config.services.xserver.enable then - [ pkgs.firefox - pkgs.thunderbird - ] - else - [ ]; -} - - - With multiple modules, it may not be obvious what the final value of - a configuration option is. The command - nixos-option allows you to find out: - - -$ nixos-option services.xserver.enable -true - -$ nixos-option boot.kernelModules -[ "tun" "ipv6" "loop" ... ] - - - Interactive exploration of the configuration is possible using - nix repl, a read-eval-print loop for Nix - expressions. A typical use: - - -$ nix repl '<nixpkgs/nixos>' - -nix-repl> config.networking.hostName -"mandark" - -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts -[ "example.org" "example.gov" ] - - - While abstracting your configuration, you may find it useful to - generate modules using code, instead of writing files. The example - below would have the same effect as importing a file which sets - those options. - - -{ config, pkgs, ... }: - -let netConfig = hostName: { - networking.hostName = hostName; - networking.useDHCP = false; -}; - -in - -{ imports = [ (netConfig "nixos.localdomain") ]; } - -
diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml deleted file mode 100644 index c49618b4b942..000000000000 --- a/nixos/doc/manual/from_md/configuration/network-manager.section.xml +++ /dev/null @@ -1,49 +0,0 @@ -
- NetworkManager - - To facilitate network configuration, some desktop environments use - NetworkManager. You can enable NetworkManager by setting: - - -networking.networkmanager.enable = true; - - - some desktop managers (e.g., GNOME) enable NetworkManager - automatically for you. - - - All users that should have permission to change network settings - must belong to the networkmanager group: - - -users.users.alice.extraGroups = [ "networkmanager" ]; - - - NetworkManager is controlled using either nmcli - or nmtui (curses-based terminal user interface). - See their manual pages for details on their usage. Some desktop - environments (GNOME, KDE) have their own configuration tools for - NetworkManager. On XFCE, there is no configuration tool for - NetworkManager by default: by enabling - , the graphical - applet will be installed and will launch automatically when the - graphical session is started. - - - - networking.networkmanager and - networking.wireless (WPA Supplicant) can be - used together if desired. To do this you need to instruct - NetworkManager to ignore those interfaces like: - - -networking.networkmanager.unmanaged = [ - "*" "except:type:wwan" "except:type:gsm" -]; - - - Refer to the option description for the exact syntax and - references to external documentation. - - -
diff --git a/nixos/doc/manual/from_md/configuration/networking.chapter.xml b/nixos/doc/manual/from_md/configuration/networking.chapter.xml deleted file mode 100644 index 2ed86ea3b589..000000000000 --- a/nixos/doc/manual/from_md/configuration/networking.chapter.xml +++ /dev/null @@ -1,15 +0,0 @@ - - Networking - - This section describes how to configure networking components on - your NixOS machine. - - - - - - - - - - diff --git a/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml deleted file mode 100644 index d3727edbe08d..000000000000 --- a/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml +++ /dev/null @@ -1,28 +0,0 @@ - - Package Management - - This section describes how to add additional packages to your - system. NixOS has two distinct styles of package management: - - - - - Declarative, where you declare what - packages you want in your configuration.nix. - Every time you run nixos-rebuild, NixOS will - ensure that you get a consistent set of binaries corresponding - to your specification. - - - - - Ad hoc, where you install, upgrade and - uninstall packages via the nix-env command. - This style allows mixing packages from different Nixpkgs - versions. It’s the only choice for non-root users. - - - - - - diff --git a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml deleted file mode 100644 index f3aacfc0a245..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml +++ /dev/null @@ -1,38 +0,0 @@ - - Profiles - - In some cases, it may be desirable to take advantage of - commonly-used, predefined configurations provided by nixpkgs, but - different from those that come as default. This is a role fulfilled - by NixOS’s Profiles, which come as files living in - <nixpkgs/nixos/modules/profiles>. That is - to say, expected usage is to add them to the imports list of your - /etc/configuration.nix as such: - - -imports = [ - <nixpkgs/nixos/modules/profiles/profile-name.nix> -]; - - - Even if some of these profiles seem only useful in the context of - install media, many are actually intended to be used in real - installs. - - - What follows is a brief explanation on the purpose and use-case for - each profile. Detailing each option configured by each one is out of - scope. - - - - - - - - - - - - - diff --git a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml deleted file mode 100644 index 43ac5edea7f8..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml +++ /dev/null @@ -1,15 +0,0 @@ -
- All Hardware - - Enables all hardware supported by NixOS: i.e., all firmware is - included, and all devices from which one may boot are enabled in the - initrd. Its primary use is in the NixOS installation CDs. - - - The enabled kernel modules include support for SATA and PATA, SCSI - (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), - VMware, and Hyper-V. Additionally, - is enabled, and - the firmware for the ZyDAS ZD1211 chipset is specifically installed. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/base.section.xml b/nixos/doc/manual/from_md/configuration/profiles/base.section.xml deleted file mode 100644 index 83d35bd28676..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/base.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -
- Base - - Defines the software packages included in the minimal - installation CD. It installs several utilities useful in a simple - recovery or install media, such as a text-mode web browser, and - tools for manipulating block devices, networking, hardware - diagnostics, and filesystems (with their respective kernel modules). - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml b/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml deleted file mode 100644 index 9430b49ea33d..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml +++ /dev/null @@ -1,16 +0,0 @@ -
- Clone Config - - This profile is used in installer images. It provides an editable - configuration.nix that imports all the modules that were also used - when creating the image in the first place. As a result it allows - users to edit and rebuild the live-system. - - - On images where the installation media also becomes an installation - target, copying over configuration.nix should be - disabled by setting installer.cloneConfig to - false. For example, this is done in - sd-image-aarch64-installer.nix. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml deleted file mode 100644 index 09c2680a1067..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -
- Demo - - This profile just enables a demo user, with - password demo, uid 1000, - wheel group and - autologin - in the SDDM display manager. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml deleted file mode 100644 index 97c2a92dcab5..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml +++ /dev/null @@ -1,12 +0,0 @@ -
- Docker Container - - This is the profile from which the Docker images are generated. It - prepares a working system by importing the - Minimal and - Clone Config - profiles, and setting appropriate configuration options that are - useful inside a container context, like - . - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml deleted file mode 100644 index 1b109519d436..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml +++ /dev/null @@ -1,14 +0,0 @@ -
- Graphical - - Defines a NixOS configuration with the Plasma 5 desktop. It’s used - by the graphical installation CD. - - - It sets , - , - , - and to true. - It also includes glxinfo and firefox in the system packages list. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml deleted file mode 100644 index 1fd5a9179887..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml +++ /dev/null @@ -1,25 +0,0 @@ -
- Hardened - - A profile with most (vanilla) hardening options enabled by default, - potentially at the cost of stability, features and performance. - - - This includes a hardened kernel, and limiting the system information - available to processes through the /sys and - /proc filesystems. It also disables the User - Namespaces feature of the kernel, which stops Nix from being able to - build anything (this particular setting can be overridden via - ). See the - profile - source for further detail on which settings are altered. - - - - This profile enables options that are known to affect system - stability. If you experience any stability issues when using the - profile, try disabling it. If you report an issue and use this - profile, always mention that you do. - - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml deleted file mode 100644 index 0910b9ffaad2..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml +++ /dev/null @@ -1,15 +0,0 @@ -
- Headless - - Common configuration for headless machines (e.g., Amazon EC2 - instances). - - - Disables sound, - vesa, serial consoles, - emergency - mode, grub - splash images and configures the kernel to reboot - automatically on panic. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml deleted file mode 100644 index 837e69df06e1..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml +++ /dev/null @@ -1,32 +0,0 @@ -
- Installation Device - - Provides a basic configuration for installation devices like CDs. - This enables redistributable firmware, includes the - Clone Config profile - and a copy of the Nixpkgs channel, so - nixos-install works out of the box. - - - Documentation for - Nixpkgs and - NixOS are - forcefully enabled (to override the - Minimal profile - preference); the NixOS manual is shown automatically on TTY 8, - udisks is disabled. Autologin is enabled as nixos - user, while passwordless login as both root and - nixos is possible. Passwordless - sudo is enabled too. - wpa_supplicant - is enabled, but configured to not autostart. - - - It is explained how to login, start the ssh server, and if - available, how to start the display manager. - - - Several settings are tweaked so that the installer has a better - chance of succeeding under low-memory environments. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml deleted file mode 100644 index a3fe30357dff..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml +++ /dev/null @@ -1,13 +0,0 @@ -
- Minimal - - This profile defines a small NixOS configuration. It does not - contain any graphical stuff. It’s a very short file that enables - noXlibs, sets - to only support the - user-selected locale, - disables packages’ - documentation, and disables - sound. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml b/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml deleted file mode 100644 index f33464f9db4d..000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml +++ /dev/null @@ -1,11 +0,0 @@ -
- QEMU Guest - - This profile contains common configuration for virtual machines - running under QEMU (using virtio). - - - It makes virtio modules available on the initrd and sets the system - time from the hardware clock to work around a bug in qemu-kvm. - -
diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml deleted file mode 100644 index fca99edcbaea..000000000000 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ /dev/null @@ -1,62 +0,0 @@ -
- Renaming network interfaces - - NixOS uses the udev - predictable - naming scheme to assign names to network interfaces. This - means that by default cards are not given the traditional names like - eth0 or eth1, whose order can - change unpredictably across reboots. Instead, relying on physical - locations and firmware information, the scheme produces names like - ens1, enp2s0, etc. - - - These names are predictable but less memorable and not necessarily - stable: for example installing new hardware or changing firmware - settings can result in a - name - change. If this is undesirable, for example if you have a - single ethernet card, you can revert to the traditional scheme by - setting - to - false. - -
- Assigning custom names - - In case there are multiple interfaces of the same type, it’s - better to assign custom names based on the device hardware - address. For example, we assign the name wan to - the interface with MAC address - 52:54:00:12:01:01 using a netword link unit: - - -systemd.network.links."10-wan" = { - matchConfig.PermanentMACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "wan"; -}; - - - Note that links are directly read by udev, not - networkd, and will work even if networkd is disabled. - - - Alternatively, we can use a plain old udev rule: - - -services.udev.initrdRules = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ - ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" -''; - - - - The rule must be installed in the initrd using - services.udev.initrdRules, not the usual - services.udev.extraRules option. This is to - avoid race conditions with other programs controlling the - interface. - - -
-
diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml deleted file mode 100644 index e0d4031443ef..000000000000 --- a/nixos/doc/manual/from_md/configuration/ssh.section.xml +++ /dev/null @@ -1,23 +0,0 @@ -
- Secure Shell Access - - Secure shell (SSH) access to your machine can be enabled by setting: - - -services.openssh.enable = true; - - - By default, root logins using a password are disallowed. They can be - disabled entirely by setting - to - "no". - - - You can declaratively specify authorised RSA/DSA public keys for a - user as follows: - - -users.users.alice.openssh.authorizedKeys.keys = - [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; - -
diff --git a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml deleted file mode 100644 index 26984dd411a1..000000000000 --- a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml +++ /dev/null @@ -1,139 +0,0 @@ -
- SSHFS File Systems - - SSHFS is - a - FUSE - filesystem that allows easy access to directories on a remote - machine using the SSH File Transfer Protocol (SFTP). It means that - if you have SSH access to a machine, no additional setup is needed - to mount a directory. - -
- Interactive mounting - - In NixOS, SSHFS is packaged as sshfs. Once - installed, mounting a directory interactively is simple as - running: - - -$ sshfs my-user@example.com:/my-dir /mnt/my-dir - - - Like any other FUSE file system, the directory is unmounted using: - - -$ fusermount -u /mnt/my-dir - -
-
- Non-interactive mounting - - Mounting non-interactively requires some precautions because - sshfs will run at boot and under a different - user (root). For obvious reason, you can’t input a password, so - public key authentication using an unencrypted key is needed. To - create a new key without a passphrase you can do: - - -$ ssh-keygen -t ed25519 -P '' -f example-key -Generating public/private ed25519 key pair. -Your identification has been saved in test-key -Your public key has been saved in test-key.pub -The key fingerprint is: -SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation - - - To keep the key safe, change the ownership to - root:root and make sure the permissions are - 600: OpenSSH normally refuses to use the key if - it’s not well-protected. - - - The file system can be configured in NixOS via the usual - fileSystems option. Here’s - a typical setup: - - -{ - system.fsPackages = [ pkgs.sshfs ]; - - fileSystems."/mnt/my-dir" = { - device = "my-user@example.com:/my-dir/"; - fsType = "sshfs"; - options = - [ # Filesystem options - "allow_other" # for non-root access - "_netdev" # this is a network fs - "x-systemd.automount" # mount on demand - - # SSH options - "reconnect" # handle connection drops - "ServerAliveInterval=15" # keep connections alive - "IdentityFile=/var/secrets/example-key" - ]; - }; -} - - - More options from ssh_config(5) can be given as - well, for example you can change the default SSH port or specify a - jump proxy: - - -{ - options = - [ "ProxyJump=bastion@example.com" - "Port=22" - ]; -} - - - It’s also possible to change the ssh command - used by SSHFS to connect to the server. For example: - - -{ - options = - [ (builtins.replaceStrings [" "] ["\\040"] - "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80") - ]; - -} - - - - The escaping of spaces is needed because every option is written - to the /etc/fstab file, which is a - space-separated table. - - -
- Troubleshooting - - If you’re having a hard time figuring out why mounting is - failing, you can add the option - "debug". This enables a verbose log - in SSHFS that you can access via: - - -$ journalctl -u $(systemd-escape -p /mnt/my-dir/).mount -Jun 22 11:41:18 workstation mount[87790]: SSHFS version 3.7.1 -Jun 22 11:41:18 workstation mount[87793]: executing <ssh> <-x> <-a> <-oClearAllForwardings=yes> <-oServerAliveInterval=15> <-oIdentityFile=/var/secrets/wrong-key> <-2> <my-user@example.com> <-s> <sftp> -Jun 22 11:41:19 workstation mount[87793]: my-user@example.com: Permission denied (publickey). -Jun 22 11:41:19 workstation mount[87790]: read: Connection reset by peer -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Mount process exited, code=exited, status=1/FAILURE -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Failed with result 'exit-code'. -Jun 22 11:41:19 workstation systemd[1]: Failed to mount /mnt/my-dir. -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Consumed 54ms CPU time, received 2.3K IP traffic, sent 2.7K IP traffic. - - - - If the mount point contains special characters it needs to be - escaped using systemd-escape. This is due - to the way systemd converts paths into unit names. - - -
-
-
diff --git a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml deleted file mode 100644 index 4390fc54ab53..000000000000 --- a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml +++ /dev/null @@ -1,121 +0,0 @@ - - Subversion - - Subversion - is a centralized version-control system. It can use a - variety - of protocols for communication between client and server. - -
- Subversion inside Apache HTTP - - This section focuses on configuring a web-based server on top of - the Apache HTTP server, which uses - WebDAV/DeltaV - for communication. - - - For more information on the general setup, please refer to the - the - appropriate section of the Subversion book. - - - To configure, include in - /etc/nixos/configuration.nix code to activate - Apache HTTP, setting - appropriately: - - -services.httpd.enable = true; -services.httpd.adminAddr = ...; -networking.firewall.allowedTCPPorts = [ 80 443 ]; - - - For a simple Subversion server with basic authentication, - configure the Subversion module for Apache as follows, setting - hostName and documentRoot - appropriately, and SVNParentPath to the parent - directory of the repositories, - AuthzSVNAccessFile to the location of the - .authz file describing access permission, and - AuthUserFile to the password file. - - -services.httpd.extraModules = [ - # note that order is *super* important here - { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } - { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } - ]; - services.httpd.virtualHosts = { - "svn" = { - hostName = HOSTNAME; - documentRoot = DOCUMENTROOT; - locations."/svn".extraConfig = '' - DAV svn - SVNParentPath REPO_PARENT - AuthzSVNAccessFile ACCESS_FILE - AuthName "SVN Repositories" - AuthType Basic - AuthUserFile PASSWORD_FILE - Require valid-user - ''; - } - - - The key "svn" is just a symbolic name - identifying the virtual host. The - "/svn" in - locations."/svn".extraConfig is the - path underneath which the repositories will be served. - - - This - page explains how to set up the Subversion configuration - itself. This boils down to the following: - - - Underneath REPO_PARENT repositories can be set - up as follows: - - -$ svn create REPO_NAME - - - Repository files need to be accessible by - wwwrun: - - -$ chown -R wwwrun:wwwrun REPO_PARENT - - - The password file PASSWORD_FILE can be created - as follows: - - -$ htpasswd -cs PASSWORD_FILE USER_NAME - - - Additional users can be set up similarly, omitting the - c flag: - - -$ htpasswd -s PASSWORD_FILE USER_NAME - - - The file describing access permissions - ACCESS_FILE will look something like the - following: - - -[/] -* = r - -[REPO_NAME:/] -USER_NAME = rw - - - The Subversion repositories will be accessible as - http://HOSTNAME/svn/REPO_NAME. - -
- diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml deleted file mode 100644 index d61b248d5eef..000000000000 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ /dev/null @@ -1,105 +0,0 @@ - - User Management - - NixOS supports both declarative and imperative styles of user - management. In the declarative style, users are specified in - configuration.nix. For instance, the following - states that a user account named alice shall - exist: - - -users.users.alice = { - isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; -}; - - - Note that alice is a member of the - wheel and networkmanager - groups, which allows her to use sudo to execute - commands as root and to configure the network, - respectively. Also note the SSH public key that allows remote logins - with the corresponding private key. Users created in this way do not - have a password by default, so they cannot log in via mechanisms - that require a password. However, you can use the - passwd program to set a password, which is - retained across invocations of nixos-rebuild. - - - If you set to false, then - the contents of /etc/passwd and - /etc/group will be congruent to your NixOS - configuration. For instance, if you remove a user from - and run nixos-rebuild, the user - account will cease to exist. Also, imperative commands for managing - users and groups, such as useradd, are no longer available. - Passwords may still be assigned by setting the user’s - hashedPassword - option. A hashed password can be generated using - mkpasswd. - - - A user ID (uid) is assigned automatically. You can also specify a - uid manually by adding - - -uid = 1000; - - - to the user specification. - - - Groups can be specified similarly. The following states that a group - named students shall exist: - - -users.groups.students.gid = 1000; - - - As with users, the group ID (gid) is optional and will be assigned - automatically if it’s missing. - - - In the imperative style, users and groups are managed by commands - such as useradd, groupmod and - so on. For instance, to create a user account named - alice: - - -# useradd -m alice - - - To make all nix tools available to this new user use `su - USER` - which opens a login shell (==shell that loads the profile) for given - user. This will create the ~/.nix-defexpr symlink. So run: - - -# su - alice -c "true" - - - The flag -m causes the creation of a home - directory for the new user, which is generally what you want. The - user does not have an initial password and therefore cannot log in. - A password can be set using the passwd utility: - - -# passwd alice -Enter new UNIX password: *** -Retype new UNIX password: *** - - - A user can be deleted using userdel: - - -# userdel -r alice - - - The flag -r deletes the user’s home directory. - Accounts can be modified using usermod. Unix - groups can be managed using groupadd, - groupmod and groupdel. - - diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml deleted file mode 100644 index 07892c875bb2..000000000000 --- a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml +++ /dev/null @@ -1,32 +0,0 @@ - - Wayland - - While X11 (see ) is still the primary - display technology on NixOS, Wayland support is steadily improving. - Where X11 separates the X Server and the window manager, on Wayland - those are combined: a Wayland Compositor is like an X11 window - manager, but also embeds the Wayland Server - functionality. This means it is sufficient to install a Wayland - Compositor such as sway without separately enabling a Wayland - server: - - -programs.sway.enable = true; - - - This installs the sway compositor along with some essential - utilities. Now you can start sway from the TTY console. - - - If you are using a wlroots-based compositor, like sway, and want to - be able to share your screen, you might want to activate this - option: - - -xdg.portal.wlr.enable = true; - - - and configure Pipewire using - and related options. - - diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml deleted file mode 100644 index 79feab47203a..000000000000 --- a/nixos/doc/manual/from_md/configuration/wireless.section.xml +++ /dev/null @@ -1,73 +0,0 @@ -
- Wireless Networks - - For a desktop installation using NetworkManager (e.g., GNOME), you - just have to make sure the user is in the - networkmanager group and you can skip the rest of - this section on wireless networks. - - - NixOS will start wpa_supplicant for you if you enable this setting: - - -networking.wireless.enable = true; - - - NixOS lets you specify networks for wpa_supplicant declaratively: - - -networking.wireless.networks = { - echelon = { # SSID with no spaces or special characters - psk = "abcdefgh"; - }; - "echelon's AP" = { # SSID with spaces and/or special characters - psk = "ijklmnop"; - }; - echelon = { # Hidden SSID - hidden = true; - psk = "qrstuvwx"; - }; - free.wifi = {}; # Public wireless network -}; - - - Be aware that keys will be written to the nix store in plaintext! - When no networks are set, it will default to using a configuration - file at /etc/wpa_supplicant.conf. You should edit - this file yourself to define wireless networks, WPA keys and so on - (see wpa_supplicant.conf(5)). - - - If you are using WPA2 you can generate pskRaw key using - wpa_passphrase: - - -$ wpa_passphrase ESSID PSK -network={ - ssid="echelon" - #psk="abcdefgh" - psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 -} - - -networking.wireless.networks = { - echelon = { - pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; - }; -}; - - - or you can use it to directly generate the - wpa_supplicant.conf: - - -# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - - - After you have edited the wpa_supplicant.conf, - you need to restart the wpa_supplicant service. - - -# systemctl restart wpa_supplicant.service - -
diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml deleted file mode 100644 index 319d3e980188..000000000000 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ /dev/null @@ -1,380 +0,0 @@ - - X Window System - - The X Window System (X11) provides the basis of NixOS’ graphical - user interface. It can be enabled as follows: - - -services.xserver.enable = true; - - - The X server will automatically detect and use the appropriate video - driver from a set of X.org drivers (such as vesa - and intel). You can also specify a driver - manually, e.g. - - -services.xserver.videoDrivers = [ "r128" ]; - - - to enable X.org’s xf86-video-r128 driver. - - - You also need to enable at least one desktop or window manager. - Otherwise, you can only log into a plain undecorated - xterm window. Thus you should pick one or more of - the following lines: - - -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome.enable = true; -services.xserver.desktopManager.mate.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; -services.xserver.windowManager.herbstluftwm.enable = true; - - - NixOS’s default display manager (the program - that provides a graphical login prompt and manages the X server) is - LightDM. You can select an alternative one by picking one of the - following lines: - - -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.gdm.enable = true; - - - You can set the keyboard layout (and optionally the layout variant): - - -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; - - - The X server is started automatically at boot time. If you don’t - want this to happen, you can set: - - -services.xserver.autorun = false; - - - The X server can then be started manually: - - -# systemctl start display-manager.service - - - On 64-bit systems, if you want OpenGL for 32-bit programs such as in - Wine, you should also set the following: - - -hardware.opengl.driSupport32Bit = true; - -
- Auto-login - - The x11 login screen can be skipped entirely, automatically - logging you into your window manager and desktop environment when - you boot your computer. - - - This is especially helpful if you have disk encryption enabled. - Since you already have to provide a password to decrypt your disk, - entering a second password to login can be redundant. - - - To enable auto-login, you need to define your default window - manager and desktop environment. If you wanted no desktop - environment and i3 as your your window manager, you’d define: - - -services.xserver.displayManager.defaultSession = "none+i3"; - - - Every display manager in NixOS supports auto-login, here is an - example using lightdm for a user alice: - - -services.xserver.displayManager.lightdm.enable = true; -services.xserver.displayManager.autoLogin.enable = true; -services.xserver.displayManager.autoLogin.user = "alice"; - -
-
- Intel Graphics drivers - - There are two choices for Intel Graphics drivers in X.org: - modesetting (included in the xorg-server - itself) and intel (provided by the package - xf86-video-intel). - - - The default and recommended is modesetting. It - is a generic driver which uses the kernel - mode - setting (KMS) mechanism. It supports Glamor (2D graphics - acceleration via OpenGL) and is actively maintained but may - perform worse in some cases (like in old chipsets). - - - The second driver, intel, is specific to Intel - GPUs, but not recommended by most distributions: it lacks several - modern features (for example, it doesn’t support Glamor) and the - package hasn’t been officially updated since 2015. - - - The results vary depending on the hardware, so you may have to try - both drivers. Use the option - to set one. - The recommended configuration for modern systems is: - - -services.xserver.videoDrivers = [ "modesetting" ]; - - - If you experience screen tearing no matter what, this - configuration was reported to resolve the issue: - - -services.xserver.videoDrivers = [ "intel" ]; -services.xserver.deviceSection = '' - Option "DRI" "2" - Option "TearFree" "true" -''; - - - Note that this will likely downgrade the performance compared to - modesetting or intel with - DRI 3 (default). - -
-
- Proprietary NVIDIA drivers - - NVIDIA provides a proprietary driver for its graphics cards that - has better 3D performance than the X.org drivers. It is not - enabled by default because it’s not free software. You can enable - it as follows: - - -services.xserver.videoDrivers = [ "nvidia" ]; - - - Or if you have an older card, you may have to use one of the - legacy drivers: - - -services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; - - - You may need to reboot after enabling this driver to prevent a - clash with other kernel modules. - -
-
- Proprietary AMD drivers - - AMD provides a proprietary driver for its graphics cards that is - not enabled by default because it’s not Free Software, is often - broken in nixpkgs and as of this writing doesn’t offer more - features or performance. If you still want to use it anyway, you - need to explicitly set: - - -services.xserver.videoDrivers = [ "amdgpu-pro" ]; - - - You will need to reboot after enabling this driver to prevent a - clash with other kernel modules. - -
-
- Touchpads - - Support for Synaptics touchpads (found in many laptops such as the - Dell Latitude series) can be enabled as follows: - - -services.xserver.libinput.enable = true; - - - The driver has many options (see ). - For instance, the following disables tap-to-click behavior: - - -services.xserver.libinput.touchpad.tapping = false; - - - Note: the use of services.xserver.synaptics is - deprecated since NixOS 17.09. - -
-
- GTK/Qt themes - - GTK themes can be installed either to user profile or system-wide - (via environment.systemPackages). To make Qt 5 - applications look similar to GTK ones, you can use the following - configuration: - - -qt.enable = true; -qt.platformTheme = "gtk2"; -qt.style = "gtk2"; - -
-
- Custom XKB layouts - - It is possible to install custom - - XKB keyboard layouts using the option - services.xserver.extraLayouts. - - - As a first example, we are going to create a layout based on the - basic US layout, with an additional layer to type some greek - symbols by pressing the right-alt key. - - - Create a file called us-greek with the - following content (under a directory called - symbols; it’s an XKB peculiarity that will help - with testing): - - -xkb_symbols "us-greek" -{ - include "us(basic)" // includes the base US keys - include "level3(ralt_switch)" // configures right alt as a third level switch - - key <LatA> { [ a, A, Greek_alpha ] }; - key <LatB> { [ b, B, Greek_beta ] }; - key <LatG> { [ g, G, Greek_gamma ] }; - key <LatD> { [ d, D, Greek_delta ] }; - key <LatZ> { [ z, Z, Greek_zeta ] }; -}; - - - A minimal layout specification must include the following: - - -services.xserver.extraLayouts.us-greek = { - description = "US layout with alt-gr greek"; - languages = [ "eng" ]; - symbolsFile = /yourpath/symbols/us-greek; -}; - - - - The name (after extraLayouts.) should match - the one given to the xkb_symbols block. - - - - Applying this customization requires rebuilding several packages, - and a broken XKB file can lead to the X session crashing at login. - Therefore, you’re strongly advised to test - your layout before applying it: - - -$ nix-shell -p xorg.xkbcomp -$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY - - - You can inspect the predefined XKB files for examples: - - -$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" - - - Once the configuration is applied, and you did a logout/login - cycle, the layout should be ready to use. You can try it by e.g. - running setxkbmap us-greek and then type - <alt>+a (it may not get applied in your - terminal straight away). To change the default, the usual - services.xserver.layout option can still be - used. - - - A layout can have several other components besides - xkb_symbols, for example we will define new - keycodes for some multimedia key and bind these to some symbol. - - - Use the xev utility from - pkgs.xorg.xev to find the codes of the keys of - interest, then create a media-key file to hold - the keycodes definitions - - -xkb_keycodes "media" -{ - <volUp> = 123; - <volDown> = 456; -} - - - Now use the newly define keycodes in media-sym: - - -xkb_symbols "media" -{ - key.type = "ONE_LEVEL"; - key <volUp> { [ XF86AudioLowerVolume ] }; - key <volDown> { [ XF86AudioRaiseVolume ] }; -} - - - As before, to install the layout do - - -services.xserver.extraLayouts.media = { - description = "Multimedia keys remapping"; - languages = [ "eng" ]; - symbolsFile = /path/to/media-key; - keycodesFile = /path/to/media-sym; -}; - - - - The function - pkgs.writeText <filename> <content> - can be useful if you prefer to keep the layout definitions - inside the NixOS configuration. - - - - Unfortunately, the Xorg server does not (currently) support - setting a keymap directly but relies instead on XKB rules to - select the matching components (keycodes, types, …) of a layout. - This means that components other than symbols won’t be loaded by - default. As a workaround, you can set the keymap using - setxkbmap at the start of the session with: - - -services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; - - - If you are manually starting the X server, you should set the - argument -xkbdir /etc/X11/xkb, otherwise X - won’t find your layout files. For example with - xinit run - - -$ xinit -- -xkbdir /etc/X11/xkb - - - To learn how to write layouts take a look at the XKB - documentation - . More example layouts can also be found - here - . - -
- diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml deleted file mode 100644 index 7ec69b5e9b8f..000000000000 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ /dev/null @@ -1,69 +0,0 @@ - - Xfce Desktop Environment - - To enable the Xfce Desktop Environment, set - - -services.xserver.desktopManager.xfce.enable = true; -services.xserver.displayManager.defaultSession = "xfce"; - - - Optionally, picom can be enabled for nice - graphical effects, some example settings: - - -services.picom = { - enable = true; - fade = true; - inactiveOpacity = 0.9; - shadow = true; - fadeDelta = 4; -}; - - - Some Xfce programs are not installed automatically. To install them - manually (system wide), put them into your - from - pkgs.xfce. - -
- Thunar - - Thunar (the Xfce file manager) is automatically enabled when Xfce - is enabled. To enable Thunar without enabling Xfce, use the - configuration option - instead of simply adding pkgs.xfce.thunar to - . - - - If you’d like to add extra plugins to Thunar, add them to - . You shouldn’t just - add them to . - -
-
- Troubleshooting - - Even after enabling udisks2, volume management might not work. - Thunar and/or the desktop takes time to show up. Thunar will spit - out this kind of message on start (look at - journalctl --user -b). - - -Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported - - - This is caused by some needed GNOME services not running. This is - all fixed by enabling Launch GNOME services on - startup in the Advanced tab of the Session and Startup - settings panel. Alternatively, you can 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. - -
- diff --git a/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml b/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml deleted file mode 100644 index 99dc5ce30b4b..000000000000 --- a/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml +++ /dev/null @@ -1,52 +0,0 @@ - - Contributing to this manual - - The - DocBook - and CommonMark sources of the NixOS manual are in the - nixos/doc/manual - subdirectory of the - Nixpkgs - repository. - - - You can quickly check your edits with the following: - - -$ cd /path/to/nixpkgs -$ ./nixos/doc/manual/md-to-db.sh -$ nix-build nixos/release.nix -A manual.x86_64-linux - - - If the build succeeds, the manual will be in - ./result/share/doc/nixos/index.html. - - - Contributing to the man pages - - - The man pages are written in - DocBook - which is XML. - - - To see what your edits look like: - - -$ cd /path/to/nixpkgs -$ nix-build nixos/release.nix -A manpages.x86_64-linux - - - You can then read the man page you edited by running - - -$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited - - - If you’re on a different architecture that’s supported by NixOS - (check nixos/release.nix) then replace - x86_64-linux with the architecture. - nix-build will complain otherwise, but should - also tell you which architecture you have + the supported ones. - - diff --git a/nixos/doc/manual/from_md/development/activation-script.section.xml b/nixos/doc/manual/from_md/development/activation-script.section.xml deleted file mode 100644 index 429b45c93def..000000000000 --- a/nixos/doc/manual/from_md/development/activation-script.section.xml +++ /dev/null @@ -1,150 +0,0 @@ -
- Activation script - - The activation script is a bash script called to activate the new - configuration which resides in a NixOS system in - $out/activate. Since its contents depend on your - system configuration, the contents may differ. This chapter explains - how the script works in general and some common NixOS snippets. - Please be aware that the script is executed on every boot and system - switch, so tasks that can be performed in other places should be - performed there (for example letting a directory of a service be - created by systemd using mechanisms like - StateDirectory, - CacheDirectory, … or if that’s not possible using - preStart of the service). - - - Activation scripts are defined as snippets using - . They can either be - a simple multiline string or an attribute set that can depend on - other snippets. The builder for the activation script will take - these dependencies into account and order the snippets accordingly. - As a simple example: - - -system.activationScripts.my-activation-script = { - deps = [ "etc" ]; - # supportsDryActivation = true; - text = '' - echo "Hallo i bims" - ''; -}; - - - This example creates an activation script snippet that is run after - the etc snippet. The special variable - supportsDryActivation can be set so the snippet - is also run when nixos-rebuild dry-activate is - run. To differentiate between real and dry activation, the - $NIXOS_ACTION environment variable can be read - which is set to dry-activate when a dry - activation is done. - - - An activation script can write to special files instructing - switch-to-configuration to restart/reload units. - The script will take these requests into account and will - incorporate the unit configuration as described above. This means - that the activation script will fake a modified unit - file and switch-to-configuration will act - accordingly. By doing so, configuration like - systemd.services.<name>.restartIfChanged - is respected. Since the activation script is run - after services are already - stopped, - systemd.services.<name>.stopIfChanged - cannot be taken into account anymore and the unit is always - restarted instead of being stopped and started afterwards. - - - The files that can be written to are - /run/nixos/activation-restart-list and - /run/nixos/activation-reload-list with their - respective counterparts for dry activation being - /run/nixos/dry-activation-restart-list and - /run/nixos/dry-activation-reload-list. Those - files can contain newline-separated lists of unit names where - duplicates are being ignored. These files are not create - automatically and activation scripts must take the possibility into - account that they have to create them first. - -
- NixOS snippets - - There are some snippets NixOS enables by default because disabling - them would most likely break your system. This section lists a few - of them and what they do: - - - - - binsh creates /bin/sh - which points to the runtime shell - - - - - etc sets up the contents of - /etc, this includes systemd units and - excludes /etc/passwd, - /etc/group, and - /etc/shadow (which are managed by the - users snippet) - - - - - hostname sets the system’s hostname in the - kernel (not in /etc) - - - - - modprobe sets the path to the - modprobe binary for module auto-loading - - - - - nix prepares the nix store and adds a - default initial channel - - - - - specialfs is responsible for mounting - filesystems like /proc and - sys - - - - - users creates and removes users and groups - by managing /etc/passwd, - /etc/group and - /etc/shadow. This also creates home - directories - - - - - usrbinenv creates - /usr/bin/env - - - - - var creates some directories in - /var that are not service-specific - - - - - wrappers creates setuid wrappers like - ping and sudo - - - -
-
diff --git a/nixos/doc/manual/from_md/development/assertions.section.xml b/nixos/doc/manual/from_md/development/assertions.section.xml deleted file mode 100644 index 13f04d5d1883..000000000000 --- a/nixos/doc/manual/from_md/development/assertions.section.xml +++ /dev/null @@ -1,58 +0,0 @@ -
- Warnings and Assertions - - When configuration problems are detectable in a module, it is a good - idea to write an assertion or warning. Doing so provides clear - feedback to the user and prevents errors after the build. - - - Although Nix has the abort and - builtins.trace - functions - to perform such tasks, they are not ideally suited for NixOS - modules. Instead of these functions, you can declare your warnings - and assertions using the NixOS module system. - -
- Warnings - - This is an example of using warnings. - - -{ config, lib, ... }: -{ - config = lib.mkIf config.services.foo.enable { - warnings = - if config.services.foo.bar - then [ ''You have enabled the bar feature of the foo service. - This is known to cause some specific problems in certain situations. - '' ] - else []; - } -} - -
-
- Assertions - - This example, extracted from the - syslogd - module shows how to use assertions. - Since there can only be one active syslog daemon at a time, an - assertion is useful to prevent such a broken system from being - built. - - -{ config, lib, ... }: -{ - config = lib.mkIf config.services.syslogd.enable { - assertions = - [ { assertion = !config.services.rsyslogd.enable; - message = "rsyslogd conflicts with syslogd"; - } - ]; - } -} - -
-
diff --git a/nixos/doc/manual/from_md/development/bootspec.chapter.xml b/nixos/doc/manual/from_md/development/bootspec.chapter.xml deleted file mode 100644 index 9ecbe1d1beed..000000000000 --- a/nixos/doc/manual/from_md/development/bootspec.chapter.xml +++ /dev/null @@ -1,73 +0,0 @@ - - Experimental feature: Bootspec - - Bootspec is a experimental feature, introduced in the - RFC-0125 - proposal, the reference implementation can be found - there - in order to standardize bootloader support and advanced boot - workflows such as SecureBoot and potentially more. - - - You can enable the creation of bootspec documents through - boot.bootspec.enable = true, - which will prompt a warning until - RFC-0125 - is officially merged. - -
- Schema - - The bootspec schema is versioned and validated against - a CUE schema file - which should considered as the source of truth for your - applications. - - - You will find the current version - here. - -
-
- Extensions mechanism - - Bootspec cannot account for all usecases. - - - For this purpose, Bootspec offers a generic extension facility - boot.bootspec.extensions - which can be used to inject any data needed for your usecases. - - - An example for SecureBoot is to get the Nix store path to - /etc/os-release in order to bake it into a - unified kernel image: - - -{ config, lib, ... }: { - boot.bootspec.extensions = { - "org.secureboot.osRelease" = config.environment.etc."os-release".source; - }; -} - - - To reduce incompatibility and prevent names from clashing between - applications, it is highly - recommended to use a unique namespace for your - extensions. - -
-
- External bootloaders - - It is possible to enable your own bootloader through - boot.loader.external.installHook - which can wrap an existing bootloader. - - - Currently, there is no good story to compose existing bootloaders - to enrich their features, e.g. SecureBoot, etc. It will be - necessary to reimplement or reuse existing parts. - -
- diff --git a/nixos/doc/manual/from_md/development/building-parts.chapter.xml b/nixos/doc/manual/from_md/development/building-parts.chapter.xml deleted file mode 100644 index 4df24cc95652..000000000000 --- a/nixos/doc/manual/from_md/development/building-parts.chapter.xml +++ /dev/null @@ -1,124 +0,0 @@ - - Building Specific Parts of NixOS - - With the command nix-build, you can build - specific parts of your NixOS configuration. This is done as follows: - - -$ cd /path/to/nixpkgs/nixos -$ nix-build -A config.option - - - where option is a NixOS option with type - derivation (i.e. something that can be built). - Attributes of interest include: - - - - - system.build.toplevel - - - - The top-level option that builds the entire NixOS system. - Everything else in your configuration is indirectly pulled in - by this option. This is what nixos-rebuild - builds and what /run/current-system points - to afterwards. - - - A shortcut to build this is: - - -$ nix-build -A system - - - - - - system.build.manual.manualHTML - - - - The NixOS manual. - - - - - - system.build.etc - - - - A tree of symlinks that form the static parts of - /etc. - - - - - - system.build.initialRamdisk , - system.build.kernel - - - - The initial ramdisk and kernel of the system. This allows a - quick way to test whether the kernel and the initial ramdisk - boot correctly, by using QEMU’s -kernel and - -initrd options: - - -$ nix-build -A config.system.build.initialRamdisk -o initrd -$ nix-build -A config.system.build.kernel -o kernel -$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null - - - - - - system.build.nixos-rebuild , - system.build.nixos-install , - system.build.nixos-generate-config - - - - These build the corresponding NixOS commands. - - - - - - systemd.units.unit-name.unit - - - - This builds the unit with the specified name. Note that since - unit names contain dots (e.g. - httpd.service), you need to put them - between quotes, like this: - - -$ nix-build -A 'config.systemd.units."httpd.service".unit' - - - You can also test individual units, without rebuilding the - whole system, by putting them in - /run/systemd/system: - - -$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ - /run/systemd/system/tmp-httpd.service -# systemctl daemon-reload -# systemctl start tmp-httpd.service - - - Note that the unit must not have the same name as any unit in - /etc/systemd/system since those take - precedence over /run/systemd/system. That’s - why the unit is installed as - tmp-httpd.service here. - - - - - diff --git a/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/nixos/doc/manual/from_md/development/freeform-modules.section.xml deleted file mode 100644 index c51bc76ff966..000000000000 --- a/nixos/doc/manual/from_md/development/freeform-modules.section.xml +++ /dev/null @@ -1,87 +0,0 @@ -
- Freeform modules - - Freeform modules allow you to define values for option paths that - have not been declared explicitly. This can be used to add - attribute-specific types to what would otherwise have to be - attrsOf options in order to accept all attribute - names. - - - This feature can be enabled by using the attribute - freeformType to define a freeform type. By doing - this, all assignments without an associated option will be merged - using the freeform type and combined into the resulting - config set. Since this feature nullifies name - checking for entire option trees, it is only recommended for use in - submodules. - - - - Example: Freeform submodule - - - The following shows a submodule assigning a freeform type that - allows arbitrary attributes with str values below - settings, but also declares an option for the - settings.port attribute to have it type-checked - and assign a default value. See - Example: Declaring a - type-checked settings attribute for a more - complete example. - - -{ lib, config, ... }: { - - options.settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = with lib.types; attrsOf str; - - # We want this attribute to be checked for the correct type - options.port = lib.mkOption { - type = lib.types.port; - # Declaring the option also allows defining a default value - default = 8080; - }; - - }; - }; -} - - - And the following shows what such a module then allows - - -{ - # Not a declared option, but the freeform type allows this - settings.logLevel = "debug"; - - # Not allowed because the the freeform type only allows strings - # settings.enable = true; - - # Allowed because there is a port option declared - settings.port = 80; - - # Not allowed because the port option doesn't allow strings - # settings.port = "443"; -} - - - - Freeform attributes cannot depend on other attributes of the same - set without infinite recursion: - - -{ - # This throws infinite recursion encountered - settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; -} - - - To prevent this, declare options for all attributes that need to - depend on others. For above example this means to declare - logLevel to be an option. - - -
diff --git a/nixos/doc/manual/from_md/development/importing-modules.section.xml b/nixos/doc/manual/from_md/development/importing-modules.section.xml deleted file mode 100644 index 96e5e1bb16b8..000000000000 --- a/nixos/doc/manual/from_md/development/importing-modules.section.xml +++ /dev/null @@ -1,47 +0,0 @@ -
- Importing Modules - - Sometimes NixOS modules need to be used in configuration but exist - outside of Nixpkgs. These modules can be imported: - - -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Use a locally-available module definition in - # ./example-module/default.nix - ./example-module - ]; - - services.exampleModule.enable = true; -} - - - The environment variable NIXOS_EXTRA_MODULE_PATH - is an absolute path to a NixOS module that is included alongside the - Nixpkgs NixOS modules. Like any NixOS module, this module can import - additional modules: - - -# ./module-list/default.nix -[ - ./example-module1 - ./example-module2 -] - - -# ./extra-module/default.nix -{ imports = import ./module-list.nix; } - - -# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module -{ config, lib, pkgs, ... }: - -{ - # No `imports` needed - - services.exampleModule1.enable = true; -} - -
diff --git a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml deleted file mode 100644 index 666bbec6162b..000000000000 --- a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -
- Linking NixOS tests to packages - - You can link NixOS module tests to the packages that they exercised, - so that the tests can be run automatically during code review when - the package gets changed. This is - described - in the nixpkgs manual. - -
diff --git a/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixos/doc/manual/from_md/development/meta-attributes.section.xml deleted file mode 100644 index 64234f1cc0d7..000000000000 --- a/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ /dev/null @@ -1,97 +0,0 @@ -
- Meta Attributes - - Like Nix packages, NixOS modules can declare meta-attributes to - provide extra information. Module meta attributes are defined in the - meta.nix special module. - - - meta is a top level attribute like - options and config. Available - meta-attributes are maintainers, - doc, and buildDocsInSandbox. - - - Each of the meta-attributes must be defined at most once per module - file. - - -{ config, lib, pkgs, ... }: -{ - options = { - ... - }; - - config = { - ... - }; - - meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.md; - buildDocsInSandbox = true; - }; -} - - - - - maintainers contains a list of the module - maintainers. - - - - - doc points to a valid - Nixpkgs-flavored - CommonMark file containing the module documentation. Its - contents is automatically added to - . Changes to a module - documentation have to be checked to not break building the NixOS - manual: - - -$ nix-build nixos/release.nix -A manual.x86_64-linux - - - - - buildDocsInSandbox indicates whether the - option documentation for the module can be built in a derivation - sandbox. This option is currently only honored for modules - shipped by nixpkgs. User modules and modules taken from - NIXOS_EXTRA_MODULE_PATH are always built - outside of the sandbox, as has been the case in previous - releases. - - - Building NixOS option documentation in a sandbox allows caching - of the built documentation, which greatly decreases the amount - of time needed to evaluate a system configuration that has NixOS - documentation enabled. The sandbox also restricts which - attributes may be referenced by documentation attributes (such - as option descriptions) to the options and - lib module arguments and the - pkgs.formats attribute of the - pkgs argument, config and - the rest of pkgs are disallowed and will - cause doc build failures when used. This restriction is - necessary because we cannot reproduce the full nixpkgs - instantiation with configuration and overlays from a system - configuration inside the sandbox. The options - argument only includes options of modules that are also built - inside the sandbox, referencing an option of a module that isn’t - built in the sandbox is also forbidden. - - - The default is true and should usually not be - changed; set it to false only if the module - requires access to pkgs in its documentation - (e.g. because it loads information from a linked package to - build an option type) or if its documentation depends on other - modules that also aren’t sandboxed (e.g. by using types defined - in the other module). - - - -
diff --git a/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml b/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml deleted file mode 100644 index b9ff2269676c..000000000000 --- a/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml +++ /dev/null @@ -1,14 +0,0 @@ - - NixOS Tests - - When you add some feature to NixOS, you should write a test for it. - NixOS tests are kept in the directory - nixos/tests, and are executed (using Nix) by a - testing framework that automatically starts one or more virtual - machines containing the NixOS system(s) required for the test. - - - - - - diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml deleted file mode 100644 index af05e61363e4..000000000000 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ /dev/null @@ -1,345 +0,0 @@ -
- Option Declarations - - An option declaration specifies the name, type and description of a - NixOS configuration option. It is invalid to define an option that - hasn’t been declared in any module. An option declaration generally - looks like this: - - -options = { - name = mkOption { - type = type specification; - default = default value; - example = example value; - description = lib.mdDoc "Description for use in the NixOS manual."; - }; -}; - - - The attribute names within the name attribute - path must be camel cased in general but should, as an exception, - match the - - package attribute name when referencing a Nixpkgs package. - For example, the option - services.nix-serve.bindAddress references the - nix-serve Nixpkgs package. - - - The function mkOption accepts the following - arguments. - - - - - type - - - - The type of the option (see - ). This argument is - mandatory for nixpkgs modules. Setting this is highly - recommended for the sake of documentation and type checking. - In case it is not set, a fallback type with unspecified - behavior is used. - - - - - - default - - - - The default value used if no value is defined by any module. A - default is not required; but if a default is not given, then - users of the module will have to define the value of the - option, otherwise an error will be thrown. - - - - - - defaultText - - - - A textual representation of the default value to be rendered - verbatim in the manual. Useful if the default value is a - complex expression or depends on other values or packages. Use - lib.literalExpression for a Nix expression, - lib.literalMD for a plain English - description in - Nixpkgs-flavored - Markdown format. - - - - - - example - - - - An example value that will be shown in the NixOS manual. You - can use lib.literalExpression and - lib.literalMD in the same way as in - defaultText. - - - - - - description - - - - A textual description of the option, in - Nixpkgs-flavored - Markdown format, that will be included in the NixOS - manual. During the migration process from DocBook it is - necessary to mark descriptions written in CommonMark with - lib.mdDoc. The description may still be - written in DocBook (without any marker), but this is - discouraged and will be deprecated in the future. - - - - -
- Utility functions for common option patterns -
- <literal>mkEnableOption</literal> - - Creates an Option attribute set for a boolean value option i.e - an option to be toggled on or off. - - - This function takes a single string argument, the name of the - thing to be toggled. - - - The option’s description is Whether to enable - <name>.. - - - For example: - - - -lib.mkEnableOption (lib.mdDoc "magic") -# is like -lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = lib.mdDoc "Whether to enable magic."; -} - -
- <literal>mkPackageOption</literal>, - <literal>mkPackageOptionMD</literal> - - Usage: - - -mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; } - - - Creates an Option attribute set for an option that specifies - the package a module should use for some purpose. - - - Note: You shouldn’t - necessarily make package options for all of your modules. You - can always overwrite a specific package throughout nixpkgs by - using - nixpkgs - overlays. - - - The default package is specified as a list of strings - representing its attribute path in nixpkgs. Because of this, - you need to pass nixpkgs itself as the first argument. - - - The second argument is the name of the option, used in the - description The <name> package to use.. - You can also pass an example value, either a literal string or - a package’s attribute path. - - - You can omit the default path if the name of the option is - also attribute path in nixpkgs. - - - During the transition to CommonMark documentation - mkPackageOption creates an option with a - DocBook description attribute, once the transition is - completed it will create a CommonMark description instead. - mkPackageOptionMD always creates an option - with a CommonMark description attribute and will be removed - some time after the transition is completed. - - - - Examples: - - - -lib.mkPackageOptionMD pkgs "hello" { } -# is like -lib.mkOption { - type = lib.types.package; - default = pkgs.hello; - defaultText = lib.literalExpression "pkgs.hello"; - description = lib.mdDoc "The hello package to use."; -} - - - -lib.mkPackageOptionMD pkgs "GHC" { - default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; -} -# is like -lib.mkOption { - type = lib.types.package; - default = pkgs.ghc; - defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; - description = lib.mdDoc "The GHC package to use."; -} - -
- Extensible Option Types - - Extensible option types is a feature that allow to extend - certain types declaration through multiple module files. - This feature only work with a restricted set of types, - namely enum and - submodules and any composed forms of - them. - - - Extensible option types can be used for - enum options that affects multiple - modules, or as an alternative to related - enable options. - - - As an example, we will take the case of display managers. - There is a central display manager module for generic - display manager options and a module file per display - manager backend (sddm, gdm …). - - - There are two approaches we could take with this module - structure: - - - - - Configuring the display managers independently by adding - an enable option to every display manager module - backend. (NixOS) - - - - - Configuring the display managers in the central module - by adding an option to select which display manager - backend to use. - - - - - Both approaches have problems. - - - Making backends independent can quickly become hard to - manage. For display managers, there can only be one enabled - at a time, but the type system cannot enforce this - restriction as there is no relation between each backend’s - enable option. As a result, this - restriction has to be done explicitly by adding assertions - in each display manager backend module. - - - On the other hand, managing the display manager backends in - the central module will require changing the central module - option every time a new backend is added or removed. - - - By using extensible option types, it is possible to create a - placeholder option in the central module - (Example: - Extensible type placeholder in the service module), - and to extend it in each backend module - (Example: - Extending - services.xserver.displayManager.enable in - the gdm module, - Example: - Extending - services.xserver.displayManager.enable in - the sddm module). - - - As a result, displayManager.enable option - values can be added without changing the main service module - file and the type system automatically enforces that there - can only be a single display manager enabled. - - - - Example: Extensible type placeholder - in the service module - - -services.xserver.displayManager.enable = mkOption { - description = "Display manager to use"; - type = with types; nullOr (enum [ ]); -}; - - - - Example: Extending - services.xserver.displayManager.enable in - the gdm module - - -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "gdm" ]); -}; - - - - Example: Extending - services.xserver.displayManager.enable in - the sddm module - - -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "sddm" ]); -}; - - - The placeholder declaration is a standard - mkOption declaration, but it is important - that extensible option declarations only use the - type argument. - - - Extensible option types work with any of the composed - variants of enum such as - with types; nullOr (enum [ "foo" "bar" ]) - or - with types; listOf (enum [ "foo" "bar" ]). - -
-
-
-
-
diff --git a/nixos/doc/manual/from_md/development/option-def.section.xml b/nixos/doc/manual/from_md/development/option-def.section.xml deleted file mode 100644 index 87b290ec39c6..000000000000 --- a/nixos/doc/manual/from_md/development/option-def.section.xml +++ /dev/null @@ -1,132 +0,0 @@ -
- Option Definitions - - Option definitions are generally straight-forward bindings of values - to option names, like - - -config = { - services.httpd.enable = true; -}; - - - However, sometimes you need to wrap an option definition or set of - option definitions in a property to achieve - certain effects: - -
- Delaying Conditionals - - If a set of option definitions is conditional on the value of - another option, you may need to use mkIf. - Consider, for instance: - - -config = if config.services.httpd.enable then { - environment.systemPackages = [ ... ]; - ... -} else {}; - - - This definition will cause Nix to fail with an infinite - recursion error. Why? Because the value of - config.services.httpd.enable depends on the - value being constructed here. After all, you could also write the - clearly circular and contradictory: - - -config = if config.services.httpd.enable then { - services.httpd.enable = false; -} else { - services.httpd.enable = true; -}; - - - The solution is to write: - - -config = mkIf config.services.httpd.enable { - environment.systemPackages = [ ... ]; - ... -}; - - - The special function mkIf causes the evaluation - of the conditional to be pushed down into the - individual definitions, as if you had written: - - -config = { - environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; - ... -}; - -
-
- Setting Priorities - - A module can override the definitions of an option in other - modules by setting an override priority. All - option definitions that do not have the lowest priority value are - discarded. By default, option definitions have priority 100 and - option defaults have priority 1500. You can specify an explicit - priority by using mkOverride, e.g. - - -services.openssh.enable = mkOverride 10 false; - - - This definition causes all other definitions with priorities above - 10 to be discarded. The function mkForce is - equal to mkOverride 50, and - mkDefault is equal to - mkOverride 1000. - -
-
- Ordering Definitions - - It is also possible to influence the order in which the - definitions for an option are merged by setting an order - priority with mkOrder. The default - order priority is 1000. The functions mkBefore - and mkAfter are equal to - mkOrder 500 and - mkOrder 1500, respectively. As an example, - - -hardware.firmware = mkBefore [ myFirmware ]; - - - This definition ensures that myFirmware comes - before other unordered definitions in the final list value of - hardware.firmware. - - - Note that this is different from - override - priorities: setting an order does not affect whether the - definition is included or not. - -
-
- Merging Configurations - - In conjunction with mkIf, it is sometimes - useful for a module to return multiple sets of option definitions, - to be merged together as if they were declared in separate - modules. This can be done using mkMerge: - - -config = mkMerge - [ # Unconditional stuff. - { environment.systemPackages = [ ... ]; - } - # Conditional stuff. - (mkIf config.services.bla.enable { - environment.systemPackages = [ ... ]; - }) - ]; - -
-
diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml deleted file mode 100644 index 363399b08661..000000000000 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ /dev/null @@ -1,1148 +0,0 @@ -
- Options Types - - Option types are a way to put constraints on the values a module - option can take. Types are also responsible of how values are merged - in case of multiple value definitions. - -
- Basic types - - Basic types are the simplest available types in the module system. - Basic types include multiple string types that mainly differ in - how definition merging is handled. - - - - - types.bool - - - - A boolean, its values can be true or - false. - - - - - - types.path - - - - A filesystem path is anything that starts with a slash when - coerced to a string. Even if derivations can be considered - as paths, the more specific types.package - should be preferred. - - - - - - types.package - - - - A top-level store path. This can be an attribute set - pointing to a store path, like a derivation or a flake - input. - - - - - - types.enum - l - - - - One element of the list - l, e.g. - types.enum [ "left" "right" ]. - Multiple definitions cannot be merged. - - - - - - types.anything - - - - A type that accepts any value and recursively merges - attribute sets together. This type is recommended when the - option type is unknown. - - - - Example: - types.anything Example - - - Two definitions of this type like - - -{ - str = lib.mkDefault "foo"; - pkg.hello = pkgs.hello; - fun.fun = x: x + 1; -} - - -{ - str = lib.mkIf true "bar"; - pkg.gcc = pkgs.gcc; - fun.fun = lib.mkForce (x: x + 2); -} - - - will get merged to - - -{ - str = "bar"; - pkg.gcc = pkgs.gcc; - pkg.hello = pkgs.hello; - fun.fun = x: x + 2; -} - - - - - - types.raw - - - - A type which doesn’t do any checking, merging or nested - evaluation. It accepts a single arbitrary value that is not - recursed into, making it useful for values coming from - outside the module system, such as package sets or arbitrary - data. Options of this type are still evaluated according to - priorities and conditionals, so mkForce, - mkIf and co. still work on the option - value itself, but not for any value nested within it. This - type should only be used when checking, merging and nested - evaluation are not desirable. - - - - - - types.optionType - - - - The type of an option’s type. Its merging operation ensures - that nested options have the correct file location - annotated, and that if possible, multiple option definitions - are correctly merged together. The main use case is as the - type of the _module.freeformType option. - - - - - - types.attrs - - - - A free-form attribute set. - - - - This type will be deprecated in the future because it - doesn’t recurse into attribute sets, silently drops - earlier attribute definitions, and doesn’t discharge - lib.mkDefault, - lib.mkIf and co. For allowing arbitrary - attribute sets, prefer - types.attrsOf types.anything instead - which doesn’t have these problems. - - - - - -
- Numeric types - - - - types.int - - - - A signed integer. - - - - - - types.ints.{s8, s16, s32} - - - - Signed integers with a fixed length (8, 16 or 32 bits). - They go from −2^n/2 to 2^n/2−1 respectively (e.g. - −128 to 127 for 8 - bits). - - - - - - types.ints.unsigned - - - - An unsigned integer (that is >= 0). - - - - - - types.ints.{u8, u16, u32} - - - - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from 0 to 2^n−1 respectively (e.g. - 0 to 255 for 8 - bits). - - - - - - types.ints.between - lowest highest - - - - An integer between - lowest and - highest (both - inclusive). - - - - - - types.ints.positive - - - - A positive integer (that is > 0). - - - - - - types.port - - - - A port number. This type is an alias to - types.ints.u16. - - - - - - types.float - - - - A floating point number. - - - - Converting a floating point number to a string with - toString or toJSON - may result in - precision - loss. - - - - - - - types.number - - - - Either a signed integer or a floating point number. No - implicit conversion is done between the two types, and - multiple equal definitions will only be merged if they - have the same type. - - - - - - types.numbers.between - lowest highest - - - - An integer or floating point number between - lowest and - highest (both - inclusive). - - - - - - types.numbers.nonnegative - - - - A nonnegative integer or floating point number (that is - >= 0). - - - - - - types.numbers.positive - - - - A positive integer or floating point number (that is > - 0). - - - - -
-
- String types - - - - types.str - - - - A string. Multiple definitions cannot be merged. - - - - - - types.separatedString - sep - - - - A string. Multiple definitions are concatenated with - sep, e.g. - types.separatedString "|". - - - - - - types.lines - - - - A string. Multiple definitions are concatenated with a new - line "\n". - - - - - - types.commas - - - - A string. Multiple definitions are concatenated with a - comma ",". - - - - - - types.envVar - - - - A string. Multiple definitions are concatenated with a - colon ":". - - - - - - types.strMatching - - - - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is - processed using builtins.match. - - - - -
-
-
- Submodule types - - Submodules are detailed in - Submodule. - - - - - types.submodule - o - - - - A set of sub options - o. - o can be an - attribute set, a function returning an attribute set, or a - path to a file containing such a value. Submodules are used - in composed types to create modular options. This is - equivalent to - types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. - - - - - - types.submoduleWith { - modules, - specialArgs ? {}, - shorthandOnlyDefinesConfig - ? false } - - - - Like types.submodule, but more flexible - and with better defaults. It has parameters - - - - - modules A list - of modules to use by default for this submodule type. - This gets combined with all option definitions to build - the final list of modules that will be included. - - - - Only options defined with this argument are included - in rendered documentation. - - - - - - specialArgs An - attribute set of extra arguments to be passed to the - module functions. The option - _module.args should be used instead - for most arguments since it allows overriding. - specialArgs - should only be used for arguments that can’t go through - the module fixed-point, because of infinite recursion or - other problems. An example is overriding the - lib argument, because - lib itself is used to define - _module.args, which makes using - _module.args to define it impossible. - - - - - shorthandOnlyDefinesConfig - Whether definitions of this type should default to the - config section of a module (see - Example: Structure of - NixOS Modules) if it is an attribute set. - Enabling this only has a benefit when the submodule - defines an option named config or - options. In such a case it would - allow the option to be set with - the-submodule.config = "value" - instead of requiring - the-submodule.config.config = "value". - This is because only when modules - don’t set the - config or options - keys, all keys are interpreted as option definitions in - the config section. Enabling this - option implicitly puts all attributes in the - config section. - - - With this option enabled, defining a - non-config section requires using a - function: - the-submodule = { ... }: { options = { ... }; }. - - - - - - - - types.deferredModule - - - - Whereas submodule represents an option - tree, deferredModule represents a module - value, such as a module file or a configuration. - - - It can be set multiple times. - - - Module authors can use its value in - imports, in - submoduleWiths - modules or in - evalModules - modules parameter, among other places. - - - Note that imports must be evaluated - before the module fixpoint. Because of this, deferred - modules can only be imported into other - fixpoints, such as submodules. - - - One use case for this type is the type of a - default module that allow the user to affect - all submodules in an attrsOf submodule at - once. This is more convenient and discoverable than - expecting the module user to type-merge with the - attrsOf submodule option. - - - - -
-
- Composed types - - Composed types are types that take a type as parameter. - listOf int and - either int str are examples of composed types. - - - - - types.listOf - t - - - - A list of t type, - e.g. types.listOf int. Multiple - definitions are merged with list concatenation. - - - - - - types.attrsOf - t - - - - An attribute set of where all the values are of - t type. Multiple - definitions result in the joined attribute set. - - - - This type is strict in its values, - which in turn means attributes cannot depend on other - attributes. See types.lazyAttrsOf for - a lazy version. - - - - - - - types.lazyAttrsOf - t - - - - An attribute set of where all the values are of - t type. Multiple - definitions result in the joined attribute set. This is the - lazy version of types.attrsOf , allowing - attributes to depend on each other. - - - - This version does not fully support conditional - definitions! With an option foo of this - type and a definition - foo.attr = lib.mkIf false 10, - evaluating foo ? attr will return - true even though it should be false. - Accessing the value will then throw an error. For types - t that have an - emptyValue defined, that value will be - returned instead of throwing an error. So if the type of - foo.attr was - lazyAttrsOf (nullOr int), - null would be returned instead for the - same mkIf false definition. - - - - - - - types.nullOr - t - - - - null or type - t. Multiple - definitions are merged according to type - t. - - - - - - types.uniq - t - - - - Ensures that type t - cannot be merged. It is used to ensure option definitions - are declared only once. - - - - - - types.unique - { message = m } - t - - - - Ensures that type t - cannot be merged. Prints the message - m, after the line - The option <option path> is defined multiple times. - and before a list of definition locations. - - - - - - types.either - t1 t2 - - - - Type t1 or type - t2, e.g. - with types; either int str. Multiple - definitions cannot be merged. - - - - - - types.oneOf [ - t1 t2 … ] - - - - Type t1 or type - t2 and so forth, - e.g. with types; oneOf [ int str bool ]. - Multiple definitions cannot be merged. - - - - - - types.coercedTo - from f to - - - - Type to or type - from which will be - coerced to type to - using function f - which takes an argument of type - from and return a - value of type to. - Can be used to preserve backwards compatibility of an option - if its type was changed. - - - - -
-
- Submodule - - submodule is a very powerful type that defines - a set of sub-options that are handled like a separate module. - - - It takes a parameter o, - that should be a set, or a function returning a set with an - options key defining the sub-options. Submodule - option definitions are type-checked accordingly to the - options declarations. Of course, you can nest - submodule option definitions for even higher modularity. - - - The option set can be defined directly - (Example: Directly defined - submodule) or as reference - (Example: Submodule defined - as a reference). - - - Note that even if your submodule’s options all have a default - value, you will still need to provide a default value (e.g. an - empty attribute set) if you want to allow users to leave it - undefined. - - - - Example: Directly defined - submodule - - -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }; -}; - - - - Example: Submodule defined as a - reference - - -let - modOptions = { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = int; - }; - }; - }; -in -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule modOptions; -}; - - - The submodule type is especially interesting - when used with composed types like attrsOf or - listOf. When composed with - listOf - (Example: - Declaration of a list of submodules), - submodule allows multiple definitions of the - submodule option set - (Example: - Definition of a list of submodules). - - - - Example: Declaration of a list of - submodules - - -options.mod = mkOption { - description = "submodule example"; - type = with types; listOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; - - - - Example: Definition of a list of - submodules - - -config.mod = [ - { foo = 1; bar = "one"; } - { foo = 2; bar = "two"; } -]; - - - When composed with attrsOf - (Example: - Declaration of attribute sets of submodules), - submodule allows multiple named definitions of - the submodule option set - (Example: - Definition of attribute sets of submodules). - - - - Example: Declaration of attribute sets of - submodules - - -options.mod = mkOption { - description = "submodule example"; - type = with types; attrsOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; - - - - Example: Definition of attribute sets of - submodules - - -config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; }; - -
-
- Extending types - - Types are mainly characterized by their check - and merge functions. - - - - - check - - - - The function to type check the value. Takes a value as - parameter and return a boolean. It is possible to extend a - type check with the addCheck function - (Example: Adding a - type check), or to fully override the check function - (Example: - Overriding a type check). - - - - Example: Adding a type - check - - -byte = mkOption { - description = "An integer between 0 and 255."; - type = types.addCheck types.int (x: x >= 0 && x <= 255); -}; - - - - Example: Overriding a type - check - - -nixThings = mkOption { - description = "words that start with 'nix'"; - type = types.str // { - check = (x: lib.hasPrefix "nix" x) - }; -}; - - - - - - merge - - - - Function to merge the options values when multiple values - are set. The function takes two parameters, - loc the option path as a list of strings, - and defs the list of defined values as a - list. It is possible to override a type merge function for - custom needs. - - - - -
-
- Custom types - - Custom types can be created with the - mkOptionType function. As type creation - includes some more complex topics such as submodule handling, it - is recommended to get familiar with types.nix - code before creating a new type. - - - The only required parameter is name. - - - - - name - - - - A string representation of the type function name. - - - - - - definition - - - - Description of the type used in documentation. Give - information of the type and any of its arguments. - - - - - - check - - - - A function to type check the definition value. Takes the - definition value as a parameter and returns a boolean - indicating the type check result, true - for success and false for failure. - - - - - - merge - - - - A function to merge multiple definitions values. Takes two - parameters: - - - - - loc - - - - The option path as a list of strings, e.g. - ["boot" "loader "grub" "enable"]. - - - - - - defs - - - - The list of sets of defined value - and file where the value was - defined, e.g. - [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]. - The merge function should return - the merged value or throw an error in case the values - are impossible or not meant to be merged. - - - - - - - - - getSubOptions - - - - For composed types that can take a submodule as type - parameter, this function generate sub-options documentation. - It takes the current option prefix as a list and return the - set of sub-options. Usually defined in a recursive manner by - adding a term to the prefix, e.g. - prefix: elemType.getSubOptions (prefix ++ ["prefix"]) - where - "prefix" - is the newly added prefix. - - - - - - getSubModules - - - - For composed types that can take a submodule as type - parameter, this function should return the type parameters - submodules. If the type parameter is called - elemType, the function should just - recursively look into submodules by returning - elemType.getSubModules;. - - - - - - substSubModules - - - - For composed types that can take a submodule as type - parameter, this function can be used to substitute the - parameter of a submodule type. It takes a module as - parameter and return the type with the submodule options - substituted. It is usually defined as a type function call - with a recursive call to substSubModules, - e.g for a type composedType that take an - elemtype type parameter, this function - should be defined as - m: composedType (elemType.substSubModules m). - - - - - - typeMerge - - - - A function to merge multiple type declarations. Takes the - type to merge functor as parameter. A - null return value means that type cannot - be merged. - - - - - f - - - - The type to merge functor. - - - - - - Note: There is a generic defaultTypeMerge - that work with most of value and composed types. - - - - - - functor - - - - An attribute set representing the type. It is used for type - operations and has the following keys: - - - - - type - - - - The type function. - - - - - - wrapped - - - - Holds the type parameter for composed types. - - - - - - payload - - - - Holds the value parameter for value types. The types - that have a payload are the - enum, - separatedString and - submodule types. - - - - - - binOp - - - - A binary operation that can merge the payloads of two - same types. Defined as a function that take two - payloads as parameters and return the payloads merged. - - - - - - - -
-
diff --git a/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixos/doc/manual/from_md/development/replace-modules.section.xml deleted file mode 100644 index d8aaf59df366..000000000000 --- a/nixos/doc/manual/from_md/development/replace-modules.section.xml +++ /dev/null @@ -1,70 +0,0 @@ -
- Replace Modules - - Modules that are imported can also be disabled. The option - declarations, config implementation and the imports of a disabled - module will be ignored, allowing another to take its place. This can - be used to import a set of modules from another channel while - keeping the rest of the system on a stable release. - - - disabledModules is a top level attribute like - imports, options and - config. It contains a list of modules that will - be disabled. This can either be the full path to the module or a - string with the filename relative to the modules path (eg. - <nixpkgs/nixos/modules> for nixos). - - - This example will replace the existing postgresql module with the - version defined in the nixos-unstable channel while keeping the rest - of the modules and packages from the original nixos channel. This - only overrides the module definition, this won’t use postgresql from - nixos-unstable unless explicitly configured to do so. - - -{ config, lib, pkgs, ... }: - -{ - disabledModules = [ "services/databases/postgresql.nix" ]; - - imports = - [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable - <nixos-unstable/nixos/modules/services/databases/postgresql.nix> - ]; - - services.postgresql.enable = true; -} - - - This example shows how to define a custom module as a replacement - for an existing module. Importing this module will disable the - original module without having to know its implementation details. - - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.man; -in - -{ - disabledModules = [ "services/programs/man.nix" ]; - - options = { - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable manual pages."; - }; - }; - - config = mkIf cfg.enabled { - warnings = [ "disabled manpages for production deployments." ]; - }; -} - -
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml deleted file mode 100644 index 30aa24f26e63..000000000000 --- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ /dev/null @@ -1,104 +0,0 @@ -
- Running Tests interactively - - The test itself can be run interactively. This is particularly - useful when developing or debugging a test: - - -$ nix-build . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver -[...] ->>> - - - You can then take any Python statement, e.g. - - ->>> start_all() ->>> test_script() ->>> machine.succeed("touch /tmp/foo") ->>> print(machine.succeed("pwd")) # Show stdout of command - - - The function test_script executes the entire test - script and drops you back into the test driver command line upon its - completion. This allows you to inspect the state of the VMs after - the test (e.g. to debug the test script). - -
- Shell access in interactive mode - - The function - <yourmachine>.shell_interact() grants - access to a shell running inside a virtual machine. To use it, - replace <yourmachine> with the name of a - virtual machine defined in the test, for example: - machine.shell_interact(). Keep in mind that - this shell may not display everything correctly as it is running - within an interactive Python REPL, and logging output from the - virtual machine may overwrite input and output from the guest - shell: - - ->>> machine.shell_interact() -machine: Terminal is ready (there is no initial prompt): -$ hostname -machine - - - As an alternative, you can proxy the guest shell to a local TCP - server by first starting a TCP server in a terminal using the - command: - - -$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr` - - - In the terminal where the test driver is running, connect to this - server by using: - - ->>> machine.shell_interact("tcp:127.0.0.1:4444") - - - Once the connection is established, you can enter commands in the - socat terminal where socat is running. - -
-
- Reuse VM state - - You can re-use the VM states coming from a previous run by setting - the --keep-vm-state flag. - - -$ ./result/bin/nixos-test-driver --keep-vm-state - - - The machine state is stored in the - $TMPDIR/vm-state-machinename directory. - -
-
- Interactive-only test configuration - - The .driverInteractive attribute combines the - regular test configuration with definitions from the - interactive - submodule. This gives you a more usable, graphical, but - slightly different configuration. - - - You can add your own interactive-only test configuration by adding - extra configuration to the - interactive - submodule. - - - To interactively run only the regular configuration, build the - <test>.driver attribute instead, and call - it with the flag - result/bin/nixos-test-driver --interactive. - -
-
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml deleted file mode 100644 index 23abb546899f..000000000000 --- a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml +++ /dev/null @@ -1,23 +0,0 @@ -
- Running Tests - - You can run tests using nix-build. For example, - to run the test - login.nix, - you do: - - -$ cd /my/git/clone/of/nixpkgs -$ nix-build -A nixosTests.login - - - After building/downloading all required dependencies, this will - perform a build that starts a QEMU/KVM virtual machine containing a - NixOS system. The virtual machine mounts the Nix store of the host; - this makes VM creation very fast, as no disk image needs to be - created. Afterwards, you can view a log of the test: - - -$ nix-store --read-log result - -
diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml deleted file mode 100644 index 898cd3b2b6e9..000000000000 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ /dev/null @@ -1,420 +0,0 @@ -
- Options for Program Settings - - Many programs have configuration files where program-specific - settings can be declared. File formats can be separated into two - categories: - - - - - Nix-representable ones: These can trivially be mapped to a - subset of Nix syntax. E.g. JSON is an example, since its values - like {"foo":{"bar":10}} - can be mapped directly to Nix: - { foo = { bar = 10; }; }. Other examples are - INI, YAML and TOML. The following section explains the - convention for these settings. - - - - - Non-nix-representable ones: These can’t be trivially mapped to a - subset of Nix syntax. Most generic programming languages are in - this group, e.g. bash, since the statement - if true; then echo hi; fi doesn’t have a - trivial representation in Nix. - - - Currently there are no fixed conventions for these, but it is - common to have a configFile option for - setting the configuration file path directly. The default value - of configFile can be an auto-generated file, - with convenient options for controlling the contents. For - example an option of type attrsOf str can be - used for representing environment variables which generates a - section like export FOO="foo". - Often it can also be useful to also include an - extraConfig option of type - lines to allow arbitrary text after the - autogenerated part of the file. - - - -
- Nix-representable Formats (JSON, YAML, TOML, INI, …) - - By convention, formats like this are handled with a generic - settings option, representing the full program - configuration as a Nix value. The type of this option should - represent the format. The most common formats have a predefined - type and string generator already declared under - pkgs.formats: - - - - - pkgs.formats.javaProperties { - comment ? - "Generated with Nix" } - - - - A function taking an attribute set with values - - - - - comment - - - - A string to put at the start of the file in a comment. - It can have multiple lines. - - - - - - It returns the type: - attrsOf str and a function - generate to build a Java - .properties file, taking care of the - correct escaping, etc. - - - - - - pkgs.formats.json { } - - - - A function taking an empty attribute set (for future - extensibility) and returning a set with JSON-specific - attributes type and - generate as specified - below. - - - - - - pkgs.formats.yaml { } - - - - A function taking an empty attribute set (for future - extensibility) and returning a set with YAML-specific - attributes type and - generate as specified - below. - - - - - - pkgs.formats.ini { - listsAsDuplicateKeys ? - false, listToValue ? - null, ... } - - - - A function taking an attribute set with values - - - - - listsAsDuplicateKeys - - - - A boolean for controlling whether list values can be - used to represent duplicate INI keys - - - - - - listToValue - - - - A function for turning a list of values into a single - value. - - - - - - It returns a set with INI-specific attributes - type and generate as - specified below. - - - - - - pkgs.formats.toml { } - - - - A function taking an empty attribute set (for future - extensibility) and returning a set with TOML-specific - attributes type and - generate as specified - below. - - - - - - pkgs.formats.elixirConf { elixir ? pkgs.elixir } - - - - A function taking an attribute set with values - - - - - elixir - - - - The Elixir package which will be used to format the - generated output - - - - - - It returns a set with Elixir-Config-specific attributes - type, lib, and - generate as specified - below. - - - The lib attribute contains functions to - be used in settings, for generating special Elixir values: - - - - - mkRaw elixirCode - - - - Outputs the given string as raw Elixir code - - - - - - mkGetEnv { envVariable, fallback ? null } - - - - Makes the configuration fetch an environment variable - at runtime - - - - - - mkAtom atom - - - - Outputs the given string as an Elixir atom, instead of - the default Elixir binary string. Note: lowercase - atoms still needs to be prefixed with - : - - - - - - mkTuple array - - - - Outputs the given array as an Elixir tuple, instead of - the default Elixir list - - - - - - mkMap attrset - - - - Outputs the given attribute set as an Elixir map, - instead of the default Elixir keyword list - - - - - - - - - These functions all return an attribute set with these values: - - - - - type - - - - A module system type representing a value of the format - - - - - - lib - - - - Utility functions for convenience, or special interactions - with the format. This attribute is optional. It may contain - inside a types attribute containing types - specific to this format. - - - - - - generate - filename jsonValue - - - - A function that can render a value of the format to a file. - Returns a file path. - - - - This function puts the value contents in the Nix store. So - this should be avoided for secrets. - - - - - - - - Example: Module with conventional - settings option - - - The following shows a module for an example program that uses a - JSON configuration file. It demonstrates how above values can be - used, along with some other related best practices. See the - comments for explanations. - - -{ options, config, lib, pkgs, ... }: -let - cfg = config.services.foo; - # Define the settings format used for this program - settingsFormat = pkgs.formats.json {}; -in { - - options.services.foo = { - enable = lib.mkEnableOption "foo service"; - - settings = lib.mkOption { - # Setting this type allows for correct merging behavior - type = settingsFormat.type; - default = {}; - description = '' - Configuration for foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported settings. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - # We can assign some default settings here to make the service work by just - # enabling it. We use `mkDefault` for values that can be changed without - # problems - services.foo.settings = { - # Fails at runtime without any value set - log_level = lib.mkDefault "WARN"; - - # We assume systemd's `StateDirectory` is used, so we require this value, - # therefore no mkDefault - data_path = "/var/lib/foo"; - - # Since we use this to create a user we need to know the default value at - # eval time - user = lib.mkDefault "foo"; - }; - - environment.etc."foo.json".source = - # The formats generator function takes a filename and the Nix value - # representing the format value and produces a filepath with that value - # rendered in the format - settingsFormat.generate "foo-config.json" cfg.settings; - - # We know that the `user` attribute exists because we set a default value - # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = { isSystemUser = true; }; - - # ... - }; -} - -
- Option declarations for attributes - - Some settings attributes may deserve some - extra care. They may need a different type, default or merging - behavior, or they are essential options that should show their - documentation in the manual. This can be done using - . - - - We extend above example using freeform modules to declare an - option for the port, which will enforce it to be a valid integer - and make it show up in the manual. - - - - Example: Declaring a type-checked - settings attribute - - -settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = settingsFormat.type; - - # Declare an option for the port such that the type is checked and this option - # is shown in the manual. - options.port = lib.mkOption { - type = lib.types.port; - default = 8080; - description = '' - Which port this service should listen on. - ''; - }; - - }; - default = {}; - description = '' - Configuration for Foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported values. - ''; -}; - -
-
-
diff --git a/nixos/doc/manual/from_md/development/sources.chapter.xml b/nixos/doc/manual/from_md/development/sources.chapter.xml deleted file mode 100644 index aac18c9d06c8..000000000000 --- a/nixos/doc/manual/from_md/development/sources.chapter.xml +++ /dev/null @@ -1,90 +0,0 @@ - - Getting the Sources - - By default, NixOS’s nixos-rebuild command uses - the NixOS and Nixpkgs sources provided by the - nixos channel (kept in - /nix/var/nix/profiles/per-user/root/channels/nixos). - To modify NixOS, however, you should check out the latest sources - from Git. This is as follows: - - -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs -$ git remote update origin - - - This will check out the latest Nixpkgs sources to - ./nixpkgs the NixOS sources to - ./nixpkgs/nixos. (The NixOS source tree lives in - a subdirectory of the Nixpkgs repository.) The - nixpkgs repository has branches that correspond - to each Nixpkgs/NixOS channel (see - for more information about channels). Thus, the Git branch - origin/nixos-17.03 will contain the latest built - and tested version available in the nixos-17.03 - channel. - - - It’s often inconvenient to develop directly on the master branch, - since if somebody has just committed (say) a change to GCC, then the - binary cache may not have caught up yet and you’ll have to rebuild - everything from source. So you may want to create a local branch - based on your current NixOS version: - - -$ nixos-version -17.09pre104379.6e0b727 (Hummingbird) - -$ git checkout -b local 6e0b727 - - - Or, to base your local branch on the latest version available in a - NixOS channel: - - -$ git remote update origin -$ git checkout -b local origin/nixos-17.03 - - - (Replace nixos-17.03 with the name of the channel - you want to use.) You can use git merge or - git rebase to keep your local branch in sync with - the channel, e.g. - - -$ git remote update origin -$ git merge origin/nixos-17.03 - - - You can use git cherry-pick to copy commits from - your local branch to the upstream branch. - - - If you want to rebuild your system using your (modified) sources, - you need to tell nixos-rebuild about them using - the -I flag: - - -# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - - - If you want nix-env to use the expressions in - /my/sources, use - nix-env -f /my/sources/nixpkgs, or change the - default by adding a symlink in ~/.nix-defexpr: - - -$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - - - You may want to delete the symlink - ~/.nix-defexpr/channels_root to prevent root’s - NixOS channel from clashing with your own tree (this may break the - command-not-found utility though). If you want to go back to the - default state, you may just remove the - ~/.nix-defexpr directory completely, log out and - log in again and it should have been recreated with a link to the - root channels. - - diff --git a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml deleted file mode 100644 index 286d49f3c291..000000000000 --- a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml +++ /dev/null @@ -1,22 +0,0 @@ - - Testing the Installer - - Building, burning, and booting from an installation CD is rather - tedious, so here is a quick way to see if the installer works - properly: - - -# mount -t tmpfs none /mnt -# nixos-generate-config --root /mnt -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install -# ./result/bin/nixos-install - - - To start a login shell in the new NixOS installation in - /mnt: - - -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter -# ./result/bin/nixos-enter - - diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml deleted file mode 100644 index 4c980e1213a8..000000000000 --- a/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ /dev/null @@ -1,131 +0,0 @@ -
- Unit handling - - To figure out what units need to be - started/stopped/restarted/reloaded, the script first checks the - current state of the system, similar to what - systemctl list-units shows. For each of the - units, the script goes through the following checks: - - - - - Is the unit file still in the new system? If not, - stop the service unless it - sets X-StopOnRemoval in the - [Unit] section to false. - - - - - Is it a .target unit? If so, - start it unless it sets - RefuseManualStart in the - [Unit] section to true or - X-OnlyManualStart in the - [Unit] section to true. - Also stop the unit again - unless it sets X-StopOnReconfiguration to - false. - - - - - Are the contents of the unit files different? They are compared - by parsing them and comparing their contents. If they are - different but only X-Reload-Triggers in the - [Unit] section is changed, - reload the unit. The NixOS - module system allows setting these triggers with the option - systemd.services.<name>.reloadTriggers. - There are some additional keys in the [Unit] - section that are ignored as well. If the unit files differ in - any way, the following actions are performed: - - - - - .path and .slice units - are ignored. There is no need to restart them since changes - in their values are applied by systemd when systemd is - reloaded. - - - - - .mount units are - reloaded. These mostly - come from the /etc/fstab parser. - - - - - .socket units are currently ignored. This - is to be fixed at a later point. - - - - - The rest of the units (mostly .service - units) are then reloaded - if X-ReloadIfChanged in the - [Service] section is set to - true (exposed via - systemd.services.<name>.reloadIfChanged). - A little exception is done for units that were deactivated - in the meantime, for example because they require a unit - that got stopped before. These are - started instead of - reloaded. - - - - - If the reload flag is not set, some more flags decide if the - unit is skipped. These flags are - X-RestartIfChanged in the - [Service] section (exposed via - systemd.services.<name>.restartIfChanged), - RefuseManualStop in the - [Unit] section, and - X-OnlyManualStart in the - [Unit] section. - - - - - Further behavior depends on the unit having - X-StopIfChanged in the - [Service] section set to - true (exposed via - systemd.services.<name>.stopIfChanged). - This is set to true by default and must - be explicitly turned off if not wanted. If the flag is - enabled, the unit is - stopped and then - started. If not, the unit - is restarted. The goal of - the flag is to make sure that the new unit never runs in the - old environment which is still in place before the - activation script is run. This behavior is different when - the service is socket-activated, as outlined in the - following steps. - - - - - The last thing that is taken into account is whether the - unit is a service and socket-activated. If - X-StopIfChanged is - not set, the service is - restarted with the - others. If it is set, both the service and the socket are - stopped and the socket is - started, leaving socket - activation to start the service when it’s needed. - - - - - -
diff --git a/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml b/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml deleted file mode 100644 index 66ba792ddacb..000000000000 --- a/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml +++ /dev/null @@ -1,122 +0,0 @@ - - What happens during a system switch? - - Running nixos-rebuild switch is one of the more - common tasks under NixOS. This chapter explains some of the - internals of this command to make it simpler for new module - developers to configure their units correctly and to make it easier - to understand what is happening and why for curious administrators. - - - nixos-rebuild, like many deployment solutions, - calls switch-to-configuration which resides in a - NixOS system at $out/bin/switch-to-configuration. - The script is called with the action that is to be performed like - switch, test, - boot. There is also the - dry-activate action which does not really perform - the actions but rather prints what it would do if you called it with - test. This feature can be used to check what - service states would be changed if the configuration was switched - to. - - - If the action is switch or - boot, the bootloader is updated first so the - configuration will be the next one to boot. Unless - NIXOS_NO_SYNC is set to 1, - /nix/store is synced to disk. - - - If the action is switch or - test, the currently running system is inspected - and the actions to switch to the new system are calculated. This - process takes two data sources into account: - /etc/fstab and the current systemd status. Mounts - and swaps are read from /etc/fstab and the - corresponding actions are generated. If a new mount is added, for - example, the proper .mount unit is marked to be - started. The current systemd state is inspected, the difference - between the current system and the desired configuration is - calculated and actions are generated to get to this state. There are - a lot of nuances that can be controlled by the units which are - explained here. - - - After calculating what should be done, the actions are carried out. - The order of actions is always the same: - - - - - Stop units (systemctl stop) - - - - - Run activation script ($out/activate) - - - - - See if the activation script requested more units to restart - - - - - Restart systemd if needed - (systemd daemon-reexec) - - - - - Forget about the failed state of units - (systemctl reset-failed) - - - - - Reload systemd (systemctl daemon-reload) - - - - - Reload systemd user instances - (systemctl --user daemon-reload) - - - - - Set up tmpfiles (systemd-tmpfiles --create) - - - - - Reload units (systemctl reload) - - - - - Restart units (systemctl restart) - - - - - Start units (systemctl start) - - - - - Inspect what changed during these actions and print units that - failed and that were newly started - - - - - Most of these actions are either self-explaining but some of them - have to do with our units or the activation script. For this reason, - these topics are explained in the next sections. - - - - diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml deleted file mode 100644 index 0d8a33df2069..000000000000 --- a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml +++ /dev/null @@ -1,144 +0,0 @@ - - Writing NixOS Documentation - - As NixOS grows, so too does the need for a catalogue and explanation - of its extensive functionality. Collecting pertinent information - from disparate sources and presenting it in an accessible style - would be a worthy contribution to the project. - -
- Building the Manual - - The DocBook sources of the - are in the - nixos/doc/manual - subdirectory of the Nixpkgs repository. - - - You can quickly validate your edits with make: - - -$ cd /path/to/nixpkgs/nixos/doc/manual -$ nix-shell -nix-shell$ make - - - Once you are done making modifications to the manual, it’s - important to build it before committing. You can do that as - follows: - - -nix-build nixos/release.nix -A manual.x86_64-linux - - - When this command successfully finishes, it will tell you where - the manual got generated. The HTML will be accessible through the - result symlink at - ./result/share/doc/nixos/index.html. - -
-
- Editing DocBook XML - - For general information on how to write in DocBook, see - DocBook - 5: The Definitive Guide. - - - Emacs nXML Mode is very helpful for editing DocBook XML because it - validates the document as you write, and precisely locates errors. - To use it, see . - - - Pandoc can generate - DocBook XML from a multitude of formats, which makes a good - starting point. Here is an example of Pandoc invocation to convert - GitHub-Flavoured MarkDown to DocBook 5 XML: - - -pandoc -f markdown_github -t docbook5 docs.md -o my-section.md - - - Pandoc can also quickly convert a single - section.xml to HTML, which is helpful when - drafting. - - - Sometimes writing valid DocBook is simply too difficult. In this - case, submit your documentation updates in a - GitHub - Issue and someone will handle the conversion to XML for - you. - -
-
- Creating a Topic - - You can use an existing topic as a basis for the new topic or - create a topic from scratch. - - - Keep the following guidelines in mind when you create and add a - topic: - - - - - The NixOS - book - element is in nixos/doc/manual/manual.xml. - It includes several - parts - which are in subdirectories. - - - - - Store the topic file in the same directory as the - part to which it belongs. If your topic is - about configuring a NixOS module, then the XML file can be - stored alongside the module definition nix - file. - - - - - If you include multiple words in the file name, separate the - words with a dash. For example: - ipv6-config.xml. - - - - - Make sure that the xml:id value is unique. - You can use abbreviations if the ID is too long. For example: - nixos-config. - - - - - Determine whether your topic is a chapter or a section. If you - are unsure, open an existing topic file and check whether the - main element is chapter or section. - - - -
-
- Adding a Topic to the Book - - Open the parent XML file and add an xi:include - element to the list of chapters with the file name of the topic - that you created. If you created a section, you - add the file to the chapter file. If you - created a chapter, you add the file to the - part file. - - - If the topic is about configuring a NixOS module, it can be - automatically included in the manual by using the - meta.doc attribute. See - for an explanation. - -
- diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml deleted file mode 100644 index 35e94845c97e..000000000000 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ /dev/null @@ -1,245 +0,0 @@ - - Writing NixOS Modules - - NixOS has a modular system for declarative configuration. This - system combines multiple modules to produce the - full system configuration. One of the modules that constitute the - configuration is /etc/nixos/configuration.nix. - Most of the others live in the - nixos/modules - subdirectory of the Nixpkgs tree. - - - Each NixOS module is a file that handles one logical aspect of the - configuration, such as a specific kind of hardware, a service, or - network settings. A module configuration does not have to handle - everything from scratch; it can use the functionality provided by - other modules for its implementation. Thus a module can - declare options that can be used by other - modules, and conversely can define options - provided by other modules in its own implementation. For example, - the module - pam.nix - declares the option security.pam.services that - allows other modules (e.g. - sshd.nix) - to define PAM services; and it defines the option - environment.etc (declared by - etc.nix) - to cause files to be created in /etc/pam.d. - - - In , we saw the following - structure of NixOS modules: - - -{ config, pkgs, ... }: - -{ option definitions -} - - - This is actually an abbreviated form of module - that only defines options, but does not declare any. The structure - of full NixOS modules is shown in - Example: Structure of NixOS - Modules. - - - - Example: Structure of NixOS - Modules - - -{ config, pkgs, ... }: - -{ - imports = - [ paths of other modules - ]; - - options = { - option declarations - }; - - config = { - option definitions - }; -} - - - The meaning of each part is as follows. - - - - - The first line makes the current Nix expression a function. The - variable pkgs contains Nixpkgs (by default, - it takes the nixpkgs entry of - NIX_PATH, see the - Nix - manual for further details), while - config contains the full system - configuration. This line can be omitted if there is no reference - to pkgs and config inside - the module. - - - - - This imports list enumerates the paths to - other NixOS modules that should be included in the evaluation of - the system configuration. A default set of modules is defined in - the file modules/module-list.nix. These don’t - need to be added in the import list. - - - - - The attribute options is a nested set of - option declarations (described below). - - - - - The attribute config is a nested set of - option definitions (also described below). - - - - - Example: NixOS Module for the - locate Service shows a module that handles the - regular update of the locate database, an index of - all files in the file system. This module declares two options that - can be defined by other modules (typically the user’s - configuration.nix): - services.locate.enable (whether the database - should be updated) and services.locate.interval - (when the update should be done). It implements its functionality by - defining two options declared by other modules: - systemd.services (the set of all systemd - services) and systemd.timers (the list of - commands to be executed periodically by systemd). - - - Care must be taken when writing systemd services using - Exec* directives. By default systemd performs - substitution on %<char> specifiers in these - directives, expands environment variables from - $FOO and ${FOO}, splits - arguments on whitespace, and splits commands on - ;. All of these must be escaped to avoid - unexpected substitution or splitting when interpolating into an - Exec* directive, e.g. when using an - extraArgs option to pass additional arguments to - the service. The functions - utils.escapeSystemdExecArg and - utils.escapeSystemdExecArgs are provided for - this, see Example: Escaping in - Exec directives for an example. When using these functions - system environment substitution should not be - disabled explicitly. - - - - Example: NixOS Module for the - locate Service - - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.locate; -in { - options.services.locate = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the locate command. - ''; - }; - - interval = mkOption { - type = types.str; - default = "02:15"; - example = "hourly"; - description = '' - Update the locate database at this interval. Updates by - default at 2:15 AM every day. - - The format is described in - systemd.time(7). - ''; - }; - - # Other options omitted for documentation - }; - - config = { - systemd.services.update-locatedb = - { description = "Update Locate Database"; - path = [ pkgs.su ]; - script = - '' - mkdir -m 0755 -p $(dirname ${toString cfg.output}) - exec updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ - --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} - ''; - }; - - systemd.timers.update-locatedb = mkIf cfg.enable - { description = "Update timer for locate database"; - partOf = [ "update-locatedb.service" ]; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; - }; - }; -} - - - - Example: Escaping in Exec - directives - - -{ config, lib, pkgs, utils, ... }: - -with lib; - -let - cfg = config.services.echo; - echoAll = pkgs.writeScript "echo-all" '' - #! ${pkgs.runtimeShell} - for s in "$@"; do - printf '%s\n' "$s" - done - ''; - args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; -in { - systemd.services.echo = - { description = "Echo to the journal"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = '' - ${echoAll} ${utils.escapeSystemdExecArgs args} - ''; - }; -} - - - - - - - - - - - diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml deleted file mode 100644 index 308f7c6fb0f6..000000000000 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ /dev/null @@ -1,782 +0,0 @@ -
- Writing Tests - - A NixOS test is a module that has the following structure: - - -{ - - # One or more machines: - nodes = - { machine = - { config, pkgs, ... }: { … }; - machine2 = - { config, pkgs, ... }: { … }; - … - }; - - testScript = - '' - Python code… - ''; -} - - - We refer to the whole test above as a test module, whereas the - values in - nodes.<name> - are NixOS modules themselves. - - - The option - testScript - is a piece of Python code that executes the test (described below). - During the test, it will start one or more virtual machines, the - configuration of which is described by the option - nodes. - - - An example of a single-node test is - login.nix. - It only needs a single machine to test whether users can log in on - the virtual console, whether device ownership is correctly - maintained when switching between consoles, and so on. An - interesting multi-node test is - nfs/simple.nix. - It uses two client nodes to test correct locking across server - crashes. - -
- Calling a test - - Tests are invoked differently depending on whether the test is - part of NixOS or lives in a different project. - -
- Testing within NixOS - - Tests that are part of NixOS are added to - nixos/tests/all-tests.nix. - - - hostname = runTest ./hostname.nix; - - - Overrides can be added by defining an anonymous module in - all-tests.nix. - - - hostname = runTest { - imports = [ ./hostname.nix ]; - defaults.networking.firewall.enable = false; - }; - - - You can run a test with attribute name - hostname in - nixos/tests/all-tests.nix by invoking: - - -cd /my/git/clone/of/nixpkgs -nix-build -A nixosTests.hostname - -
-
- Testing outside the NixOS project - - Outside the nixpkgs repository, you can - instantiate the test by first importing the NixOS library, - - -let nixos-lib = import (nixpkgs + "/nixos/lib") { }; -in - -nixos-lib.runTest { - imports = [ ./test.nix ]; - hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs - defaults.services.foo.package = mypkg; -} - - - runTest returns a derivation that runs the - test. - -
-
-
- Configuring the nodes - - There are a few special NixOS options for test VMs: - - - - - virtualisation.memorySize - - - - The memory of the VM in megabytes. - - - - - - virtualisation.vlans - - - - The virtual networks to which the VM is connected. See - nat.nix - for an example. - - - - - - virtualisation.writableStore - - - - By default, the Nix store in the VM is not writable. If you - enable this option, a writable union file system is mounted - on top of the Nix store to make it appear writable. This is - necessary for tests that run Nix operations that modify the - store. - - - - - - For more options, see the module - qemu-vm.nix. - - - The test script is a sequence of Python statements that perform - various actions, such as starting VMs, executing commands in the - VMs, and so on. Each virtual machine is represented as an object - stored in the variable name if this is also the - identifier of the machine in the declarative config. If you - specified a node nodes.machine, the following - example starts the machine, waits until it has finished booting, - then executes a command and checks that the output is more-or-less - correct: - - -machine.start() -machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") - - - The first line is technically unnecessary; machines are implicitly - started when you first execute an action on them (such as - wait_for_unit or succeed). - If you have multiple machines, you can speed up the test by - starting them in parallel: - - -start_all() - -
-
- Machine objects - - The following methods are available on machine objects: - - - - - start - - - - Start the virtual machine. This method is asynchronous — it - does not wait for the machine to finish booting. - - - - - - shutdown - - - - Shut down the machine, waiting for the VM to exit. - - - - - - crash - - - - Simulate a sudden power failure, by telling the VM to exit - immediately. - - - - - - block - - - - Simulate unplugging the Ethernet cable that connects the - machine to the other machines. - - - - - - unblock - - - - Undo the effect of block. - - - - - - screenshot - - - - Take a picture of the display of the virtual machine, in PNG - format. The screenshot is linked from the HTML log. - - - - - - get_screen_text_variants - - - - Return a list of different interpretations of what is - currently visible on the machine’s screen using optical - character recognition. The number and order of the - interpretations is not specified and is subject to change, - but if no exception is raised at least one will be returned. - - - - This requires - enableOCR - to be set to true. - - - - - - - get_screen_text - - - - Return a textual representation of what is currently visible - on the machine’s screen using optical character recognition. - - - - This requires - enableOCR - to be set to true. - - - - - - - send_monitor_command - - - - Send a command to the QEMU monitor. This is rarely used, but - allows doing stuff such as attaching virtual USB disks to a - running machine. - - - - - - send_key - - - - Simulate pressing keys on the virtual keyboard, e.g., - send_key("ctrl-alt-delete"). - - - - - - send_chars - - - - Simulate typing a sequence of characters on the virtual - keyboard, e.g., - send_chars("foobar\n") will - type the string foobar followed by the - Enter key. - - - - - - send_console - - - - Send keys to the kernel console. This allows interaction - with the systemd emergency mode, for example. Takes a string - that is sent, e.g., - send_console("\n\nsystemctl default\n"). - - - - - - execute - - - - Execute a shell command, returning a list - (status, stdout). - - - Commands are run with set -euo pipefail - set: - - - - - If several commands are separated by - ; and one fails, the command as a - whole will fail. - - - - - For pipelines, the last non-zero exit status will be - returned (if there is one; otherwise zero will be - returned). - - - - - Dereferencing unset variables fails the command. - - - - - It will wait for stdout to be closed. - - - - - If the command detaches, it must close stdout, as - execute will wait for this to consume all - output reliably. This can be achieved by redirecting stdout - to stderr >&2, to - /dev/console, - /dev/null or a file. Examples of - detaching commands are sleep 365d &, - where the shell forks a new process that can write to stdout - and xclip -i, where the - xclip command itself forks without - closing stdout. - - - Takes an optional parameter check_return - that defaults to True. Setting this - parameter to False will not check for the - return code and return -1 instead. This can be used for - commands that shut down the VM and would therefore break the - pipe that would be used for retrieving the return code. - - - A timeout for the command can be specified (in seconds) - using the optional timeout parameter, - e.g., execute(cmd, timeout=10) or - execute(cmd, timeout=None). The default - is 900 seconds. - - - - - - succeed - - - - Execute a shell command, raising an exception if the exit - status is not zero, otherwise returning the standard output. - Similar to execute, except that the - timeout is None by default. See - execute for details on command execution. - - - - - - fail - - - - Like succeed, but raising an exception if - the command returns a zero status. - - - - - - wait_until_succeeds - - - - Repeat a shell command with 1-second intervals until it - succeeds. Has a default timeout of 900 seconds which can be - modified, e.g. - wait_until_succeeds(cmd, timeout=10). See - execute for details on command execution. - - - - - - wait_until_fails - - - - Like wait_until_succeeds, but repeating - the command until it fails. - - - - - - wait_for_unit - - - - Wait until the specified systemd unit has reached the - active state. - - - - - - wait_for_file - - - - Wait until the specified file exists. - - - - - - wait_for_open_port - - - - Wait until a process is listening on the given TCP port and - IP address (default localhost). - - - - - - wait_for_closed_port - - - - Wait until nobody is listening on the given TCP port and IP - address (default localhost). - - - - - - wait_for_x - - - - Wait until the X11 server is accepting connections. - - - - - - wait_for_text - - - - Wait until the supplied regular expressions matches the - textual contents of the screen by using optical character - recognition (see get_screen_text and - get_screen_text_variants). - - - - This requires - enableOCR - to be set to true. - - - - - - - wait_for_console_text - - - - Wait until the supplied regular expressions match a line of - the serial console output. This method is useful when OCR is - not possible or accurate enough. - - - - - - wait_for_window - - - - Wait until an X11 window has appeared whose name matches the - given regular expression, e.g., - wait_for_window("Terminal"). - - - - - - copy_from_host - - - - Copies a file from host to machine, e.g., - copy_from_host("myfile", "/etc/my/important/file"). - - - The first argument is the file on the host. The file needs - to be accessible while building the nix derivation. The - second argument is the location of the file on the machine. - - - - - - systemctl - - - - Runs systemctl commands with optional - support for systemctl --user - - -machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` -machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - - - - - - shell_interact - - - - Allows you to directly interact with the guest shell. This - should only be used during test development, not in - production tests. Killing the interactive session with - Ctrl-d or Ctrl-c also - ends the guest session. - - - - - - console_interact - - - - Allows you to directly interact with QEMU’s stdin. This - should only be used during test development, not in - production tests. Output from QEMU is only read line-wise. - Ctrl-c kills QEMU and - Ctrl-d closes console and returns to the - test runner. - - - - - - To test user units declared by - systemd.user.services the optional - user argument can be used: - - -machine.start() -machine.wait_for_x() -machine.wait_for_unit("xautolock.service", "x-session-user") - - - This applies to systemctl, - get_unit_info, - wait_for_unit, start_job and - stop_job. - - - For faster dev cycles it’s also possible to disable the - code-linters (this shouldn’t be committed though): - - -{ - skipLint = true; - nodes.machine = - { config, pkgs, ... }: - { configuration… - }; - - testScript = - '' - Python code… - ''; -} - - - This will produce a Nix warning at evaluation time. To fully - disable the linter, wrap the test script in comment directives to - disable the Black linter directly (again, don’t commit this within - the Nixpkgs repository): - - - testScript = - '' - # fmt: off - Python code… - # fmt: on - ''; - - - Similarly, the type checking of test scripts can be disabled in - the following way: - - -{ - skipTypeCheck = true; - nodes.machine = - { config, pkgs, ... }: - { configuration… - }; -} - -
-
- Failing tests early - - To fail tests early when certain invariants are no longer met - (instead of waiting for the build to time out), the decorator - polling_condition is provided. For example, if - we are testing a program foo that should not - quit after being started, we might write the following: - - -@polling_condition -def foo_running(): - machine.succeed("pgrep -x foo") - - -machine.succeed("foo --start") -machine.wait_until_succeeds("pgrep -x foo") - -with foo_running: - ... # Put `foo` through its paces - - - polling_condition takes the following - (optional) arguments: - - - - - seconds_interval - - - - specifies how often the condition should be polled: - - - - - -@polling_condition(seconds_interval=10) -def foo_running(): - machine.succeed("pgrep -x foo") - - - - - description - - - - is used in the log when the condition is checked. If this is - not provided, the description is pulled from the docstring - of the function. These two are therefore equivalent: - - - - - -@polling_condition -def foo_running(): - "check that foo is running" - machine.succeed("pgrep -x foo") - - -@polling_condition(description="check that foo is running") -def foo_running(): - machine.succeed("pgrep -x foo") - -
-
- Adding Python packages to the test script - - When additional Python libraries are required in the test script, - they can be added using the parameter - extraPythonPackages. For example, you could add - numpy like this: - - -{ - extraPythonPackages = p: [ p.numpy ]; - - nodes = { }; - - # Type checking on extra packages doesn't work yet - skipTypeCheck = true; - - testScript = '' - import numpy as np - assert str(np.zeros(4) == "array([0., 0., 0., 0.])") - ''; -} - - - In that case, numpy is chosen from the generic - python3Packages. - -
-
- Test Options Reference - - The following options can be used when writing tests. - - -
-
diff --git a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml deleted file mode 100644 index 0e46c1d48ca6..000000000000 --- a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml +++ /dev/null @@ -1,111 +0,0 @@ - - Building a NixOS (Live) ISO - - Default live installer configurations are available inside - nixos/modules/installer/cd-dvd. For building - other system images, - nixos-generators - is a good place to start looking at. - - - You have two options: - - - - - Use any of those default configurations as is - - - - - Combine them with (any of) your host config(s) - - - - - System images, such as the live installer ones, know how to enforce - configuration settings on which they immediately depend in order to - work correctly. - - - However, if you are confident, you can opt to override those - enforced values with mkForce. - -
- Practical Instructions - - To build an ISO image for the channel - nixos-unstable: - - -$ git clone https://github.com/NixOS/nixpkgs.git -$ cd nixpkgs/nixos -$ git switch nixos-unstable -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix - - - To check the content of an ISO image, mount it like so: - - -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso - -
-
- Additional drivers or firmware - - If you need additional (non-distributable) drivers or firmware in - the installer, you might want to extend these configurations. - - - For example, to build the GNOME graphical installer ISO, but with - support for certain WiFi adapters present in some MacBooks, you - can create the following file at - modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix: - - -{ config, ... }: - -{ - imports = [ ./installation-cd-graphical-gnome.nix ]; - - boot.initrd.kernelModules = [ "wl" ]; - - boot.kernelModules = [ "kvm-intel" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; -} - - - Then build it like in the example above: - - -$ git clone https://github.com/NixOS/nixpkgs.git -$ cd nixpkgs/nixos -$ export NIXPKGS_ALLOW_UNFREE=1 -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix - -
-
- Technical Notes - - The config value enforcement is implemented via - mkImageMediaOverride = mkOverride 60; and - therefore primes over simple value assignments, but also yields to - mkForce. - - - This property allows image designers to implement in semantically - correct ways those configuration values upon which the correct - functioning of the image depends. - - - For example, the iso base image overrides those file systems which - it needs at a minimum for correct functioning, while the installer - base image overrides the entire file system layout because there - can’t be any other guarantees on a live medium than those given by - the live medium itself. The latter is especially true before - formatting the target block device(s). On the other hand, the - netboot iso only overrides its minimum dependencies since netboot - images are always made-to-target. - -
- diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml deleted file mode 100644 index 727c61c45d27..000000000000 --- a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml +++ /dev/null @@ -1,117 +0,0 @@ - - Changing the Configuration - - The file /etc/nixos/configuration.nix contains - the current configuration of your machine. Whenever you’ve - changed something in that - file, you should do - - -# nixos-rebuild switch - - - to build the new configuration, make it the default configuration - for booting, and try to realise the configuration in the running - system (e.g., by restarting system services). - - - - This command doesn’t start/stop - user services - automatically. nixos-rebuild only runs a - daemon-reload for each user with running user - services. - - - - - These commands must be executed as root, so you should either run - them from a root shell or by prefixing them with - sudo -i. - - - - You can also do - - -# nixos-rebuild test - - - to build the configuration and switch the running system to it, but - without making it the boot default. So if (say) the configuration - locks up your machine, you can just reboot to get back to a working - configuration. - - - There is also - - -# nixos-rebuild boot - - - to build the configuration and make it the boot default, but not - switch to it now (so it will only take effect after the next - reboot). - - - You can make your configuration show up in a different submenu of - the GRUB 2 boot screen by giving it a different profile - name, e.g. - - -# nixos-rebuild switch -p test - - - which causes the new configuration (and previous ones created using - -p test) to show up in the GRUB submenu - NixOS - Profile test. This can be - useful to separate test configurations from stable - configurations. - - - Finally, you can do - - -$ nixos-rebuild build - - - to build the configuration but nothing more. This is useful to see - whether everything compiles cleanly. - - - If you have a machine that supports hardware virtualisation, you can - also test the new configuration in a sandbox by building and running - a QEMU virtual machine that contains the - desired configuration. Just do - - -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm - - - The VM does not have any data from your host system, so your - existing user accounts and home directories will not be available - unless you have set mutableUsers = false. Another - way is to temporarily add the following to your configuration: - - -users.users.your-user.initialHashedPassword = "test"; - - - Important: delete the $hostname.qcow2 file if - you have started the virtual machine at least once without the right - users, otherwise the changes will not get picked up. You can forward - ports on the host to the guest. For instance, the following will - forward host port 2222 to guest port 22 (SSH): - - -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm - - - allowing you to log in via SSH (assuming you have set the - appropriate passwords or SSH authorized keys): - - -$ ssh -p 2222 localhost - - diff --git a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml b/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml deleted file mode 100644 index 00b4e8766718..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml +++ /dev/null @@ -1,41 +0,0 @@ -
- Installing behind a proxy - - To install NixOS behind a proxy, do the following before running - nixos-install. - - - - - Update proxy configuration in - /mnt/etc/nixos/configuration.nix to keep the - internet accessible after reboot. - - -networking.proxy.default = "http://user:password@proxy:port/"; -networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - - - - Setup the proxy environment variables in the shell where you are - running nixos-install. - - -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" - - - - - - If you are switching networks with different proxy configurations, - use the specialisation option in - configuration.nix to switch proxies at runtime. - Refer to for more information. - - -
diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml deleted file mode 100644 index 5f18d528d32d..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ /dev/null @@ -1,388 +0,0 @@ -
- Installing from another Linux distribution - - Because Nix (the package manager) & Nixpkgs (the Nix packages - collection) can both be installed on any (most?) Linux - distributions, they can be used to install NixOS in various creative - ways. You can, for instance: - - - - - Install NixOS on another partition, from your existing Linux - distribution (without the use of a USB or optical device!) - - - - - Install NixOS on the same partition (in place!), from your - existing non-NixOS Linux distribution using - NIXOS_LUSTRATE. - - - - - Install NixOS on your hard drive from the Live CD of any Linux - distribution. - - - - - The first steps to all these are the same: - - - - - Install the Nix package manager: - - - Short version: - - -$ curl -L https://nixos.org/nix/install | sh -$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell - - - More details in the - - Nix manual - - - - - Switch to the NixOS channel: - - - If you’ve just installed Nix on a non-NixOS distribution, you - will be on the nixpkgs channel by default. - - -$ nix-channel --list -nixpkgs https://nixos.org/channels/nixpkgs-unstable - - - As that channel gets released without running the NixOS tests, - it will be safer to use the nixos-* channels - instead: - - -$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs - - - You may want to throw in a - nix-channel --update for good measure. - - - - - Install the NixOS installation tools: - - - You’ll need nixos-generate-config and - nixos-install, but this also makes some man - pages and nixos-enter available, just in case - you want to chroot into your NixOS partition. NixOS installs - these by default, but you don’t have NixOS yet.. - - -$ nix-env -f '<nixpkgs>' -iA nixos-install-tools - - - - - - The following 5 steps are only for installing NixOS to another - partition. For installing NixOS in place using - NIXOS_LUSTRATE, skip ahead. - - - - Prepare your target partition: - - - At this point it is time to prepare your target partition. - Please refer to the partitioning, file-system creation, and - mounting steps of - - - If you’re about to install NixOS in place using - NIXOS_LUSTRATE there is nothing to do for - this step. - - - - - Generate your NixOS configuration: - - -$ sudo `which nixos-generate-config` --root /mnt - - - You’ll probably want to edit the configuration files. Refer to - the nixos-generate-config step in - for more information. - - - Consider setting up the NixOS bootloader to give you the ability - to boot on your existing Linux partition. For instance, if - you’re using GRUB and your existing distribution is running - Ubuntu, you may want to add something like this to your - configuration.nix: - - -boot.loader.grub.extraEntries = '' - menuentry "Ubuntu" { - search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e - configfile "($ubuntu)/boot/grub/grub.cfg" - } -''; - - - (You can find the appropriate UUID for your partition in - /dev/disk/by-uuid) - - - - - Create the nixbld group and user on your - original distribution: - - -$ sudo groupadd -g 30000 nixbld -$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld - - - - - Download/build/install NixOS: - - - - Once you complete this step, you might no longer be able to - boot on existing systems without the help of a rescue USB - drive or similar. - - - - - On some distributions there are separate PATHS for programs - intended only for root. In order for the installation to - succeed, you might have to use - PATH="$PATH:/usr/sbin:/sbin" in - the following command. - - - -$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt - - - Again, please refer to the nixos-install step - in for more information. - - - That should be it for installation to another partition! - - - - - Optionally, you may want to clean up your non-NixOS - distribution: - - -$ sudo userdel nixbld -$ sudo groupdel nixbld - - - If you do not wish to keep the Nix package manager installed - either, run something like - sudo rm -rv ~/.nix-* /nix and remove the line - that the Nix installer added to your - ~/.profile. - - - - - - The following steps are only for installing NixOS in place - using NIXOS_LUSTRATE: - - - - Generate your NixOS configuration: - - -$ sudo `which nixos-generate-config` - - - Note that this will place the generated configuration files in - /etc/nixos. You’ll probably want to edit the - configuration files. Refer to the - nixos-generate-config step in - for more information. - - - You’ll likely want to set a root password for your first boot - using the configuration files because you won’t have a chance to - enter a password until after you reboot. You can initialize the - root password to an empty one with this line: (and of course - don’t forget to set one once you’ve rebooted or to lock the - account with sudo passwd -l root if you use - sudo) - - -users.users.root.initialHashedPassword = ""; - - - - - Build the NixOS closure and install it in the - system profile: - - -$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system - - - - - Change ownership of the /nix tree to root - (since your Nix install was probably single user): - - -$ sudo chown -R 0:0 /nix - - - - - Set up the /etc/NIXOS and - /etc/NIXOS_LUSTRATE files: - - - /etc/NIXOS officializes that this is now a - NixOS partition (the bootup scripts require its presence). - - - /etc/NIXOS_LUSTRATE tells the NixOS bootup - scripts to move everything that’s in the - root partition to /old-root. This will move - your existing distribution out of the way in the very early - stages of the NixOS bootup. There are exceptions (we do need to - keep NixOS there after all), so the NixOS lustrate process will - not touch: - - - - - The /nix directory - - - - - The /boot directory - - - - - Any file or directory listed in - /etc/NIXOS_LUSTRATE (one per line) - - - - - - Support for NIXOS_LUSTRATE was added in - NixOS 16.09. The act of lustrating refers to - the wiping of the existing distribution. Creating - /etc/NIXOS_LUSTRATE can also be used on - NixOS to remove all mutable files from your root partition - (anything that’s not in /nix or - /boot gets lustrated on the - next boot. - - - lustrate /ˈlʌstreɪt/ verb. - - - purify by expiatory sacrifice, ceremonial washing, or some - other ritual action. - - - - Let’s create the files: - - -$ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE - - - Let’s also make sure the NixOS configuration files are kept once - we reboot on NixOS: - - -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE - - - - - Finally, move the /boot directory of your - current distribution out of the way (the lustrate process will - take care of the rest once you reboot, but this one must be - moved out now because NixOS needs to install its own boot files: - - - - Once you complete this step, your current distribution will no - longer be bootable! If you didn’t get all the NixOS - configuration right, especially those settings pertaining to - boot loading and root partition, NixOS may not be bootable - either. Have a USB rescue device ready in case this happens. - - - -$ sudo mv -v /boot /boot.bak && -sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - - Cross your fingers, reboot, hopefully you should get a NixOS - prompt! - - - - - If for some reason you want to revert to the old distribution, - you’ll need to boot on a USB rescue disk and do something along - these lines: - - -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot - - - This may work as is or you might also need to reinstall the boot - loader. - - - And of course, if you’re happy with NixOS and no longer need the - old distribution: - - -sudo rm -rf /old-root - - - - - It’s also worth noting that this whole process can be automated. - This is especially useful for Cloud VMs, where provider do not - provide NixOS. For instance, - nixos-infect - uses the lustrate process to convert Digital Ocean droplets to - NixOS from other distributions automatically. - - - -
diff --git a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml deleted file mode 100644 index 40a697c74096..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml +++ /dev/null @@ -1,94 +0,0 @@ -
- <quote>Booting</quote> into NixOS via kexec - - In some cases, your system might already be booted into/preinstalled - with another Linux distribution, and booting NixOS by attaching an - installation image is quite a manual process. - - - This is particularly useful for (cloud) providers where you can’t - boot a custom image, but get some Debian or Ubuntu installation. - - - In these cases, it might be easier to use kexec - to jump into NixOS from the running system, which - only assumes bash and kexec to - be installed on the machine. - - - Note that kexec may not work correctly on some hardware, as devices - are not fully re-initialized in the process. In practice, this - however is rarely the case. - - - To build the necessary files from your current version of nixpkgs, - you can run: - - -nix-build -A kexec.x86_64-linux '<nixpkgs/nixos/release.nix>' - - - This will create a result directory containing - the following: - - - - - bzImage (the Linux kernel) - - - - - initrd (the initrd file) - - - - - kexec-boot (a shellscript invoking - kexec) - - - - - These three files are meant to be copied over to the other already - running Linux Distribution. - - - Note its symlinks pointing elsewhere, so cd in, - and use scp * root@$destination to copy it over, - rather than rsync. - - - Once you finished copying, execute kexec-boot - on the destination, and after some seconds, the - machine should be booting into an (ephemeral) NixOS installation - medium. - - - In case you want to describe your own system closure to kexec into, - instead of the default installer image, you can build your own - configuration.nix: - - -{ modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/netboot/netboot-minimal.nix") - ]; - - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - "my-ssh-pubkey" - ]; -} - - -nix-build '<nixpkgs/nixos>' \ - --arg configuration ./configuration.nix - --attr config.system.build.kexecTree - - - Make sure your configuration.nix does still - import netboot-minimal.nix (or - netboot-base.nix). - -
diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml deleted file mode 100644 index 94172de65ea0..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ /dev/null @@ -1,42 +0,0 @@ -
- Booting from the <quote>netboot</quote> media (PXE) - - Advanced users may wish to install NixOS using an existing PXE or - iPXE setup. - - - These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from your current version of - nixpkgs, you can run: - - -nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' - - - This will create a result directory containing: * - bzImage – the Linux kernel * - initrd – the initrd file * - netboot.ipxe – an example ipxe script - demonstrating the appropriate kernel command line arguments for this - image - - - If you’re using plain PXE, configure your boot loader to use the - bzImage and initrd files and - have it provide the same kernel command line arguments found in - netboot.ipxe. - - - If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use netboot.ipxe - unmodified, or you may need to update the paths to the files to - match your server’s directory layout. - - - In the future we may begin making these files available as build - products from hydra at which point we will update this documentation - with instructions on how to obtain them either for placing on a - dedicated TFTP server or to boot them directly over the internet. - -
diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml deleted file mode 100644 index cb0fd95bc7c5..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-usb.section.xml +++ /dev/null @@ -1,135 +0,0 @@ -
- Booting from a USB flash drive - - The image has to be written verbatim to the USB flash drive for it - to be bootable on UEFI and BIOS systems. Here are the recommended - tools to do that. - -
- Creating bootable USB flash drive with a graphical - tool - - Etcher is a popular and user-friendly tool. It works on Linux, - Windows and macOS. - - - Download it from - balena.io, - start the program, select the downloaded NixOS ISO, then select - the USB flash drive and flash it. - - - - Etcher reports errors and usage statistics by default, which can - be disabled in the settings. - - - - An alternative is - USBImager, - which is very simple and does not connect to the internet. - Download the version with write-only (wo) interface for your - system. Start the program, select the image, select the USB flash - drive and click Write. - -
-
- Creating bootable USB flash drive from a Terminal on - Linux - - - - Plug in the USB flash drive. - - - - - Find the corresponding device with lsblk. - You can distinguish them by their size. - - - - - Make sure all partitions on the device are properly unmounted. - Replace sdX with your device (e.g. - sdb). - - - - -sudo umount /dev/sdX* - - - - - Then use the dd utility to write the image - to the USB flash drive. - - - - -sudo dd if=<path-to-image> of=/dev/sdX bs=4M conv=fsync - -
-
- Creating bootable USB flash drive from a Terminal on - macOS - - - - Plug in the USB flash drive. - - - - - Find the corresponding device with - diskutil list. You can distinguish them by - their size. - - - - - Make sure all partitions on the device are properly unmounted. - Replace diskX with your device (e.g. - disk1). - - - - -diskutil unmountDisk diskX - - - - - Then use the dd utility to write the image - to the USB flash drive. - - - - -sudo dd if=<path-to-image> of=/dev/rdiskX bs=4m - - - After dd completes, a GUI dialog The - disk you inserted was not readable by this computer will - pop up, which can be ignored. - - - - Using the raw rdiskX device - instead of diskX with dd completes in minutes - instead of hours. - - - - - - Eject the disk when it is finished. - - - - -diskutil eject /dev/diskX - -
-
diff --git a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml b/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml deleted file mode 100644 index e43508185299..000000000000 --- a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml +++ /dev/null @@ -1,92 +0,0 @@ -
- Installing in a VirtualBox guest - - Installing NixOS into a VirtualBox guest is convenient for users who - want to try NixOS without installing it on bare metal. If you want - to use a pre-made VirtualBox appliance, it is available at - the - downloads page. If you want to set up a VirtualBox guest - manually, follow these instructions: - - - - - Add a New Machine in VirtualBox with OS Type Linux / - Other Linux - - - - - Base Memory Size: 768 MB or higher. - - - - - New Hard Disk of 8 GB or higher. - - - - - Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) - - - - - Click on Settings / System / Processor and enable PAE/NX - - - - - Click on Settings / System / Acceleration and enable - VT-x/AMD-V acceleration - - - - - Click on Settings / Display / Screen and select VMSVGA as - Graphics Controller - - - - - Save the settings, start the virtual machine, and continue - installation like normal - - - - - There are a few modifications you should make in configuration.nix. - Enable booting: - - -boot.loader.grub.device = "/dev/sda"; - - - Also remove the fsck that runs at startup. It will always fail to - run, stopping your boot until you press *. - - -boot.initrd.checkJournalingFS = false; - - - Shared folders can be given a name and a path in the host system in - the VirtualBox settings (Machine / Settings / Shared Folders, then - click on the Add icon). Add the following to the - /etc/nixos/configuration.nix to auto-mount them. - If you do not add "nofail", the system - will not boot properly. - - -{ config, pkgs, ...} : -{ - fileSystems."/virtualboxshare" = { - fsType = "vboxsf"; - device = "nameofthesharedfolder"; - options = [ "rw" "nofail" ]; - }; -} - - - The folder will be available directly under the root directory. - -
diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml deleted file mode 100644 index 5654eb424fc3..000000000000 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ /dev/null @@ -1,887 +0,0 @@ - - Installing NixOS -
- Booting from the install medium - - To begin the installation, you have to boot your computer from the - install drive. - - - - - Plug in the install drive. Then turn on or restart your - computer. - - - - - Open the boot menu by pressing the appropriate key, which is - usually shown on the display on early boot. Select the USB - flash drive (the option usually contains the word - USB). If you choose the incorrect drive, your - computer will likely continue to boot as normal. In that case - restart your computer and pick a different drive. - - - - The key to open the boot menu is different across computer - brands and even models. It can be F12, but - also F1, F9, - F10, Enter, - Del, Esc or another - function key. If you are unsure and don’t see it on the - early boot screen, you can search online for your computers - brand, model followed by boot from usb. The - computer might not even have that feature, so you have to go - into the BIOS/UEFI settings to change the boot order. Again, - search online for details about your specific computer - model. - - - For Apple computers with Intel processors press and hold the - ⌥ (Option or Alt) key until you see the - boot menu. On Apple silicon press and hold the power button. - - - - - If your computer supports both BIOS and UEFI boot, choose - the UEFI option. - - - - - If you use a CD for the installation, the computer will - probably boot from it automatically. If not, choose the - option containing the word CD from the boot - menu. - - - - - - Shortly after selecting the appropriate boot drive, you should - be presented with a menu with different installer options. - Leave the default and wait (or press Enter to - speed up). - - - - - The graphical images will start their corresponding desktop - environment and the graphical installer, which can take some - time. The minimal images will boot to a command line. You have - to follow the instructions in - there. - - - -
-
- Graphical Installation - - The graphical installer is recommended for desktop users and will - guide you through the installation. - - - - - In the Welcome screen, you can select the - language of the Installer and the installed system. - - - - Leaving the language as American English will - make it easier to search for error messages in a search - engine or to report an issue. - - - - - - Next you should choose your location to have the timezone set - correctly. You can actually click on the map! - - - - The installer will use an online service to guess your - location based on your public IP address. - - - - - - Then you can select the keyboard layout. The default keyboard - model should work well with most desktop keyboards. If you - have a special keyboard or notebook, your model might be in - the list. Select the language you are most comfortable typing - in. - - - - - On the Users screen, you have to type in your - display name, login name and password. You can also enable an - option to automatically login to the desktop. - - - - - Then you have the option to choose a desktop environment. If - you want to create a custom setup with a window manager, you - can select No desktop. - - - - If you don’t have a favorite desktop and don’t know which - one to choose, you can stick to either GNOME or Plasma. They - have a quite different design, so you should choose - whichever you like better. They are both popular choices and - well tested on NixOS. - - - - - - You have the option to allow unfree software in the next - screen. - - - - - The easiest option in the Partitioning screen - is Erase disk, which will delete all data from - the selected disk and install the system on it. Also select - Swap (with Hibernation) in the dropdown below - it. You have the option to encrypt the whole disk with LUKS. - - - - At the top left you see if the Installer was booted with - BIOS or UEFI. If you know your system supports UEFI and it - shows BIOS, reboot with the correct option. - - - - - Make sure you have selected the correct disk at the top and - that no valuable data is still on the disk! It will be - deleted when formatting the disk. - - - - - - Check the choices you made in the Summary and - click Install. - - - - The installation takes about 15 minutes. The time varies - based on the selected desktop environment, internet - connection speed and disk write speed. - - - - - - When the install is complete, remove the USB flash drive and - reboot into your new system! - - - -
-
- Manual Installation - - NixOS can be installed on BIOS or UEFI systems. The procedure for - a UEFI installation is broadly the same as for a BIOS - installation. The differences are mentioned in the following - steps. - - - The NixOS manual is available by running - nixos-help in the command line or from the - application menu in the desktop environment. - - - To have access to the command line on the graphical images, open - Terminal (GNOME) or Konsole (Plasma) from the application menu. - - - You are logged-in automatically as nixos. The - nixos user account has an empty password so you - can use sudo without a password: - - -$ sudo -i - - - You can use loadkeys to switch to your - preferred keyboard layout. (We even provide neo2 via - loadkeys de neo!) - - - If the text is too small to be legible, try - setfont ter-v32n to increase the font size. - - - To install over a serial port connect with - 115200n8 (e.g. - picocom -b 115200 /dev/ttyUSB0). When the - bootloader lists boot entries, select the serial console boot - entry. - -
- Networking in the installer - - - - - - The boot process should have brought up networking (check - ip a). Networking is necessary for the - installer, since it will download lots of stuff (such as source - tarballs or Nixpkgs channel binaries). It’s best if you have a - DHCP server on your network. Otherwise configure networking - manually using ifconfig. - - - On the graphical installer, you can configure the network, wifi - included, through NetworkManager. Using the - nmtui program, you can do so even in a - non-graphical session. If you prefer to configure the network - manually, disable NetworkManager with - systemctl stop NetworkManager. - - - On the minimal installer, NetworkManager is not available, so - configuration must be performed manually. To configure the wifi, - first start wpa_supplicant with - sudo systemctl start wpa_supplicant, then run - wpa_cli. For most home networks, you need to - type in the following commands: - - -> add_network -0 -> set_network 0 ssid "myhomenetwork" -OK -> set_network 0 psk "mypassword" -OK -> set_network 0 key_mgmt WPA-PSK -OK -> enable_network 0 -OK - - - For enterprise networks, for example - eduroam, instead do: - - -> add_network -0 -> set_network 0 ssid "eduroam" -OK -> set_network 0 identity "myname@example.com" -OK -> set_network 0 password "mypassword" -OK -> set_network 0 key_mgmt WPA-EAP -OK -> enable_network 0 -OK - - - When successfully connected, you should see a line such as this - one - - -<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] - - - you can now leave wpa_cli by typing - quit. - - - If you would like to continue the installation from a different - machine you can use activated SSH daemon. You need to copy your - ssh key to either - /home/nixos/.ssh/authorized_keys or - /root/.ssh/authorized_keys (Tip: For - installers with a modifiable filesystem such as the sd-card - installer image a key can be manually placed by mounting the - image on a different machine). Alternatively you must set a - password for either root or - nixos with passwd to be - able to login. - -
-
- Partitioning and formatting - - - - - - The NixOS installer doesn’t do any partitioning or formatting, - so you need to do that yourself. - - - The NixOS installer ships with multiple partitioning tools. The - examples below use parted, but also provides - fdisk, gdisk, - cfdisk, and cgdisk. - - - The recommended partition scheme differs depending if the - computer uses Legacy Boot or - UEFI. - -
- UEFI (GPT) - - - - - - Here’s an example partition scheme for UEFI, using - /dev/sda as the device. - - - - You can safely ignore parted’s - informational message about needing to update /etc/fstab. - - - - - - Create a GPT partition table. - - -# parted /dev/sda -- mklabel gpt - - - - - Add the root partition. This will - fill the disk except for the end part, where the swap will - live, and the space left in front (512MiB) which will be - used by the boot partition. - - -# parted /dev/sda -- mkpart primary 512MB -8GB - - - - - Next, add a swap partition. The size - required will vary according to needs, here a 8GB one is - created. - - -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% - - - - The swap partition size rules are no different than for - other Linux distributions. - - - - - - Finally, the boot partition. NixOS by - default uses the ESP (EFI system partition) as its - /boot partition. It uses the - initially reserved 512MiB at the start of the disk. - - -# parted /dev/sda -- mkpart ESP fat32 1MB 512MB -# parted /dev/sda -- set 3 esp on - - - - - Once complete, you can follow with - . - -
-
- Legacy Boot (MBR) - - - - - - Here’s an example partition scheme for Legacy Boot, using - /dev/sda as the device. - - - - You can safely ignore parted’s - informational message about needing to update /etc/fstab. - - - - - - Create a MBR partition table. - - -# parted /dev/sda -- mklabel msdos - - - - - Add the root partition. This will - fill the the disk except for the end part, where the swap - will live. - - -# parted /dev/sda -- mkpart primary 1MB -8GB - - - - - Set the root partition’s boot flag to on. This allows the - disk to be booted from. - - -# parted /dev/sda -- set 1 boot on - - - - - Finally, add a swap partition. The - size required will vary according to needs, here a 8GB one - is created. - - -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% - - - - The swap partition size rules are no different than for - other Linux distributions. - - - - - - Once complete, you can follow with - . - -
-
- Formatting - - - - - - Use the following commands: - - - - - For initialising Ext4 partitions: - mkfs.ext4. It is recommended that you - assign a unique symbolic label to the file system using - the option -L label, since this makes - the file system configuration independent from device - changes. For example: - - -# mkfs.ext4 -L nixos /dev/sda1 - - - - - For creating swap partitions: mkswap. - Again it’s recommended to assign a label to the swap - partition: -L label. For example: - - -# mkswap -L swap /dev/sda2 - - - - - UEFI systems - - - For creating boot partitions: mkfs.fat. - Again it’s recommended to assign a label to the boot - partition: -n label. For example: - - -# mkfs.fat -F 32 -n boot /dev/sda3 - - - - - For creating LVM volumes, the LVM commands, e.g., - pvcreate, vgcreate, - and lvcreate. - - - - - For creating software RAID devices, use - mdadm. - - - -
-
-
- Installing - - - - - - - - Mount the target file system on which NixOS should be - installed on /mnt, e.g. - - -# mount /dev/disk/by-label/nixos /mnt - - - - - UEFI systems - - - Mount the boot file system on /mnt/boot, - e.g. - - -# mkdir -p /mnt/boot -# mount /dev/disk/by-label/boot /mnt/boot - - - - - If your machine has a limited amount of memory, you may want - to activate swap devices now - (swapon device). The installer (or - rather, the build actions that it may spawn) may need quite - a bit of RAM, depending on your configuration. - - -# swapon /dev/sda2 - - - - - You now need to create a file - /mnt/etc/nixos/configuration.nix that - specifies the intended configuration of the system. This is - because NixOS has a declarative - configuration model: you create or edit a description of the - desired configuration of your system, and then NixOS takes - care of making it happen. The syntax of the NixOS - configuration file is described in - , while a list of - available configuration options appears in - . A minimal example is shown in - Example: NixOS - Configuration. - - - The command nixos-generate-config can - generate an initial configuration file for you: - - -# nixos-generate-config --root /mnt - - - You should then edit - /mnt/etc/nixos/configuration.nix to suit - your needs: - - -# nano /mnt/etc/nixos/configuration.nix - - - If you’re using the graphical ISO image, other editors may - be available (such as vim). If you have - network access, you can also install other editors – for - instance, you can install Emacs by running - nix-env -f '<nixpkgs>' -iA emacs. - - - - - BIOS systems - - - - You must set the option - to - specify on which disk the GRUB boot loader is to be - installed. Without it, NixOS cannot boot. - - - If there are other operating systems running on the - machine before installing NixOS, the - - option can be set to true to - automatically add them to the grub menu. - - - - - - UEFI systems - - - - You must select a boot-loader, either system-boot or - GRUB. The recommended option is systemd-boot: set the - option - - to true. - nixos-generate-config should do - this automatically for new configurations when booted - in UEFI mode. - - - You may want to look at the options starting with - boot.loader.efi - and - boot.loader.systemd-boot - as well. - - - If you want to use GRUB, set - to - nodev and - to - true. - - - With system-boot, you should not need any special - configuration to detect other installed systems. With - GRUB, set - to - true, but this will only detect - windows partitions, not other linux distributions. If - you dual boot another linux distribution, use - system-boot instead. - - - - - - If you need to configure networking for your machine the - configuration options are described in - . In particular, while wifi - is supported on the installation image, it is not enabled by - default in the configuration generated by - nixos-generate-config. - - - Another critical option is fileSystems, - specifying the file systems that need to be mounted by - NixOS. However, you typically don’t need to set it yourself, - because nixos-generate-config sets it - automatically in - /mnt/etc/nixos/hardware-configuration.nix - from your currently mounted file systems. (The configuration - file hardware-configuration.nix is - included from configuration.nix and will - be overwritten by future invocations of - nixos-generate-config; thus, you - generally should not modify it.) Additionally, you may want - to look at - Hardware - configuration for known-hardware at this point or - after installation. - - - - Depending on your hardware configuration or type of file - system, you may need to set the option - boot.initrd.kernelModules to include - the kernel modules that are necessary for mounting the - root file system, otherwise the installed system will not - be able to boot. (If this happens, boot from the - installation media again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and - rerun nixos-install.) In most cases, - nixos-generate-config will figure out - the required modules. - - - - - - Do the installation: - - -# nixos-install - - - This will install your system based on the configuration you - provided. If anything fails due to a configuration problem - or any other issue (such as a network outage while - downloading binaries from the NixOS binary cache), you can - re-run nixos-install after fixing your - configuration.nix. - - - As the last step, nixos-install will ask - you to set the password for the root - user, e.g. - - -setting root password... -New password: *** -Retype new password: *** - - - - For unattended installations, it is possible to use - nixos-install --no-root-passwd in order - to disable the password prompt entirely. - - - - - - If everything went well: - - -# reboot - - - - - You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time - you change the NixOS configuration (see - Changing - Configuration), a new item is added to the menu. This - allows you to easily roll back to a previous configuration - if something goes wrong. - - - You should log in and change the root - password with passwd. - - - You’ll probably want to create some user accounts as well, - which can be done with useradd: - - -$ useradd -c 'Eelco Dolstra' -m eelco -$ passwd eelco - - - You may also want to install some software. This will be - covered in . - - - -
-
- Installation summary - - - - - - To summarise, Example: - Commands for Installing NixOS on - /dev/sda shows a typical sequence of - commands for installing NixOS on an empty hard drive (here - /dev/sda). Example: - NixOS Configuration shows a corresponding configuration - Nix expression. - - - - Example: Example partition schemes for - NixOS on /dev/sda (MBR) - - -# parted /dev/sda -- mklabel msdos -# parted /dev/sda -- mkpart primary 1MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% - - - - Example: Example partition schemes for - NixOS on /dev/sda (UEFI) - - -# parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary 512MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% -# parted /dev/sda -- mkpart ESP fat32 1MB 512MB -# parted /dev/sda -- set 3 esp on - - - - Example: Commands for Installing NixOS - on /dev/sda - - - With a partitioned disk. - - -# mkfs.ext4 -L nixos /dev/sda1 -# mkswap -L swap /dev/sda2 -# swapon /dev/sda2 -# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) -# mount /dev/disk/by-label/nixos /mnt -# mkdir -p /mnt/boot # (for UEFI systems only) -# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) -# nixos-generate-config --root /mnt -# nano /mnt/etc/nixos/configuration.nix -# nixos-install -# reboot - - - - Example: NixOS Configuration - - -{ config, pkgs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) - - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; - - # Enable the OpenSSH server. - services.sshd.enable = true; -} - -
-
-
- Additional installation notes - - - - - - -
- diff --git a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml deleted file mode 100644 index d187adfc0c53..000000000000 --- a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml +++ /dev/null @@ -1,47 +0,0 @@ - - Obtaining NixOS - - NixOS ISO images can be downloaded from the - NixOS - download page. Follow the instructions in - to create a bootable USB - flash drive. - - - If you have a very old system that can’t boot from USB, you can burn - the image to an empty CD. NixOS might not work very well on such - systems. - - - As an alternative to installing NixOS yourself, you can get a - running NixOS system through several other means: - - - - - Using virtual appliances in Open Virtualization Format (OVF) - that can be imported into VirtualBox. These are available from - the - NixOS - download page. - - - - - Using AMIs for Amazon’s EC2. To find one for your region, please - refer to the - download - page. - - - - - Using NixOps, the NixOS-based cloud deployment tool, which - allows you to provision VirtualBox and EC2 NixOS instances from - declarative specifications. Check out the - NixOps - homepage for details. - - - - diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml deleted file mode 100644 index 99882784b46f..000000000000 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ /dev/null @@ -1,152 +0,0 @@ - - Upgrading NixOS - - The best way to keep your NixOS installation up to date is to use - one of the NixOS channels. A channel is a Nix - mechanism for distributing Nix expressions and associated binaries. - The NixOS channels are updated automatically from NixOS’s Git - repository after certain tests have passed and all packages have - been built. These channels are: - - - - - Stable channels, such as - nixos-22.11. - These only get conservative bug fixes and package upgrades. For - instance, a channel update may cause the Linux kernel on your - system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), - but not from 4.19.x to 4.20.x (a major change that has the - potential to break things). Stable channels are generally - maintained until the next stable branch is created. - - - - - The unstable channel, - nixos-unstable. - This corresponds to NixOS’s main development branch, and may - thus see radical changes between channel updates. It’s not - recommended for production systems. - - - - - Small channels, such as - nixos-22.11-small - or - nixos-unstable-small. - These are identical to the stable and unstable channels - described above, except that they contain fewer binary packages. - This means they get updated faster than the regular channels - (for instance, when a critical security patch is committed to - NixOS’s source tree), but may require more packages to be built - from source than usual. They’re mostly intended for server - environments and as such contain few GUI applications. - - - - - To see what channels are available, go to - https://nixos.org/channels. - (Note that the URIs of the various channels redirect to a directory - that contains the channel’s latest version and includes ISO images - and VirtualBox appliances.) Please note that during the release - process, channels that are not yet released will be present here as - well. See the Getting NixOS page - https://nixos.org/nixos/download.html - to find the newest supported stable release. - - - When you first install NixOS, you’re automatically subscribed to the - NixOS channel that corresponds to your installation source. For - instance, if you installed from a 22.11 ISO, you will be subscribed - to the nixos-22.11 channel. To see which NixOS - channel you’re subscribed to, run the following as root: - - -# nix-channel --list | grep nixos -nixos https://nixos.org/channels/nixos-unstable - - - To switch to a different NixOS channel, do - - -# nix-channel --add https://nixos.org/channels/channel-name nixos - - - (Be sure to include the nixos parameter at the - end.) For instance, to use the NixOS 22.11 stable channel: - - -# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos - - - If you have a server, you may want to use the small - channel instead: - - -# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos - - - And if you want to live on the bleeding edge: - - -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos - - - You can then upgrade NixOS to the latest version in your chosen - channel by running - - -# nixos-rebuild switch --upgrade - - - which is equivalent to the more verbose - nix-channel --update nixos; nixos-rebuild switch. - - - - Channels are set per user. This means that running - nix-channel --add as a non root user (or - without sudo) will not affect configuration in - /etc/nixos/configuration.nix - - - - - It is generally safe to switch back and forth between channels. - The only exception is that a newer NixOS may also have a newer Nix - version, which may involve an upgrade of Nix’s database schema. - This cannot be undone easily, so in that case you will not be able - to go back to your original channel. - - -
- Automatic Upgrades - - You can keep a NixOS system up-to-date automatically by adding the - following to configuration.nix: - - -system.autoUpgrade.enable = true; -system.autoUpgrade.allowReboot = true; - - - This enables a periodically executed systemd service named - nixos-upgrade.service. If the - allowReboot option is false, - it runs nixos-rebuild switch --upgrade to - upgrade NixOS to the latest version in the current channel. (To - see when the service runs, see - systemctl list-timers.) If - allowReboot is true, then - the system will automatically reboot if the new generation - contains a different kernel, initrd or kernel modules. You can - also specify a channel explicitly, e.g. - - -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; - -
- diff --git a/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml deleted file mode 100644 index b4f3657b4b88..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml +++ /dev/null @@ -1,6 +0,0 @@ -
- Release 13.10 (<quote>Aardvark</quote>, 2013/10/31) - - This is the first stable release branch of NixOS. - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml deleted file mode 100644 index 5686545c1afb..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml +++ /dev/null @@ -1,189 +0,0 @@ -
- Release 14.04 (<quote>Baboon</quote>, 2014/04/30) - - This is the second stable release branch of NixOS. In addition to - numerous new and upgraded packages and modules, this release has the - following highlights: - - - - - Installation on UEFI systems is now supported. See - for details. - - - - - Systemd has been updated to version 212, which has - numerous - improvements. NixOS now automatically starts systemd user - instances when you log in. You can define global user units - through the systemd.unit.* options. - - - - - NixOS is now based on Glibc 2.19 and GCC 4.8. - - - - - The default Linux kernel has been updated to 3.12. - - - - - KDE has been updated to 4.12. - - - - - GNOME 3.10 experimental support has been added. - - - - - Nix has been updated to 1.7 - (details). - - - - - NixOS now supports fully declarative management of users and - groups. If you set users.mutableUsers to - false, then the contents of - /etc/passwd and /etc/group - will be - congruent - to your NixOS configuration. For instance, if you remove a user - from users.extraUsers and run - nixos-rebuild, the user account will cease to - exist. Also, imperative commands for managing users and groups, - such as useradd, are no longer available. If - users.mutableUsers is true - (the default), then behaviour is unchanged from NixOS 13.10. - - - - - NixOS now has basic container support, meaning you can easily - run a NixOS instance as a container in a NixOS host system. - These containers are suitable for testing and experimentation - but not production use, since they’re not fully isolated from - the host. See for details. - - - - - Systemd units provided by packages can now be overridden from - the NixOS configuration. For instance, if a package - foo provides systemd units, you can say: - - -{ - systemd.packages = [ pkgs.foo ]; -} - - - to enable those units. You can then set or override unit options - in the usual way, e.g. - - -{ - systemd.services.foo.wantedBy = [ "multi-user.target" ]; - systemd.services.foo.serviceConfig.MemoryLimit = "512M"; -} - - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - Nixpkgs no longer exposes unfree packages by default. If your - NixOS configuration requires unfree packages from Nixpkgs, you - need to enable support for them explicitly by setting: - - -{ - nixpkgs.config.allowUnfree = true; -} - - - Otherwise, you get an error message such as: - - - error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’ - has an unfree license, refusing to evaluate - - - - - The Adobe Flash player is no longer enabled by default in the - Firefox and Chromium wrappers. To enable it, you must set: - - -{ - nixpkgs.config.allowUnfree = true; - nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox - nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium -} - - - - - The firewall is now enabled by default. If you don’t want this, - you need to disable it explicitly: - - -{ - networking.firewall.enable = false; -} - - - - - The option boot.loader.grub.memtest86 has - been renamed to - boot.loader.grub.memtest86.enable. - - - - - The mysql55 service has been merged into the - mysql service, which no longer sets a default - for the option services.mysql.package. - - - - - Package variants are now differentiated by suffixing the name, - rather than the version. For instance, - sqlite-3.8.4.3-interactive is now called - sqlite-interactive-3.8.4.3. This ensures that - nix-env -i sqlite is unambiguous, and that - nix-env -u won’t upgrade - sqlite to - sqlite-interactive or vice versa. Notably, - this change affects the Firefox wrapper (which provides - plugins), as it is now called - firefox-wrapper. So when using - nix-env, you should do - nix-env -e firefox; nix-env -i firefox-wrapper - if you want to keep using the wrapper. This change does not - affect declarative package management, since attribute names - like pkgs.firefoxWrapper were already - unambiguous. - - - - - The symlink /etc/ca-bundle.crt is gone. - Programs should instead use the environment variable - OPENSSL_X509_CERT_FILE (which points to - /etc/ssl/certs/ca-bundle.crt). - - - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml deleted file mode 100644 index ccaa4f6bd081..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml +++ /dev/null @@ -1,466 +0,0 @@ -
- Release 14.12 (<quote>Caterpillar</quote>, 2014/12/30) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - - - - - Systemd has been updated to version 217, which has numerous - improvements. - - - - - Nix - has been updated to 1.8. - - - - - NixOS is now based on Glibc 2.20. - - - - - KDE has been updated to 4.14. - - - - - The default Linux kernel has been updated to 3.14. - - - - - If users.mutableUsers is enabled (the - default), changes made to the declaration of a user or group - will be correctly realised when running - nixos-rebuild. For instance, removing a user - specification from configuration.nix will - cause the actual user account to be deleted. If - users.mutableUsers is disabled, it is no - longer necessary to specify UIDs or GIDs; if omitted, they are - allocated dynamically. - - - - - Following new services were added since the last release: - - - - - atftpd - - - - - bosun - - - - - bspwm - - - - - chronos - - - - - collectd - - - - - consul - - - - - cpuminer-cryptonight - - - - - crashplan - - - - - dnscrypt-proxy - - - - - docker-registry - - - - - docker - - - - - etcd - - - - - fail2ban - - - - - fcgiwrap - - - - - fleet - - - - - fluxbox - - - - - gdm - - - - - geoclue2 - - - - - gitlab - - - - - gitolite - - - - - gnome3.gnome-documents - - - - - gnome3.gnome-online-miners - - - - - gnome3.gvfs - - - - - gnome3.seahorse - - - - - hbase - - - - - i2pd - - - - - influxdb - - - - - kubernetes - - - - - liquidsoap - - - - - lxc - - - - - mailpile - - - - - mesos - - - - - mlmmj - - - - - monetdb - - - - - mopidy - - - - - neo4j - - - - - nsd - - - - - openntpd - - - - - opentsdb - - - - - openvswitch - - - - - parallels-guest - - - - - peerflix - - - - - phd - - - - - polipo - - - - - prosody - - - - - radicale - - - - - redmine - - - - - riemann - - - - - scollector - - - - - seeks - - - - - siproxd - - - - - strongswan - - - - - tcsd - - - - - teamspeak3 - - - - - thermald - - - - - torque/mrom - - - - - torque/server - - - - - uhub - - - - - unifi - - - - - znc - - - - - zookeeper - - - - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - The default version of Apache httpd is now 2.4. If you use the - extraConfig option to pass literal Apache - configuration text, you may need to update it — see - Apache’s - documentation for details. If you wish to continue to use - httpd 2.2, add the following line to your NixOS configuration: - - -{ - services.httpd.package = pkgs.apacheHttpd_2_2; -} - - - - - PHP 5.3 has been removed because it is no longer supported by - the PHP project. A - migration - guide is available. - - - - - The host side of a container virtual Ethernet pair is now called - ve-container-name rather than - c-container-name. - - - - - GNOME 3.10 support has been dropped. The default GNOME version - is now 3.12. - - - - - VirtualBox has been upgraded to 4.3.20 release. Users may be - required to run rm -rf /tmp/.vbox*. The line - imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] - is no longer necessary, use - services.virtualboxHost.enable = true - instead. - - - Also, hardening mode is now enabled by default, which means that - unless you want to use USB support, you no longer need to be a - member of the vboxusers group. - - - - - Chromium has been updated to 39.0.2171.65. - enablePepperPDF is now enabled by default. - chromium*Wrapper packages no longer exist, - because upstream removed NSAPI support. - chromium-stable has been renamed to - chromium. - - - - - Python packaging documentation is now part of nixpkgs manual. To - override the python packages available to a custom python you - now use pkgs.pythonFull.buildEnv.override - instead of pkgs.pythonFull.override. - - - - - boot.resumeDevice = "8:6" is no - longer supported. Most users will want to leave it undefined, - which takes the swap partitions automatically. There is an - evaluation assertion to ensure that the string starts with a - slash. - - - - - The system-wide default timezone for NixOS installations changed - from CET to UTC. To choose - a different timezone for your system, configure - time.timeZone in - configuration.nix. A fairly complete list of - possible values for that setting is available at - https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. - - - - - GNU screen has been updated to 4.2.1, which breaks the ability - to connect to sessions created by older versions of screen. - - - - - The Intel GPU driver was updated to the 3.x prerelease version - (used by most distributions) and supports DRI3 now. - - - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml deleted file mode 100644 index 96b51a051066..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml +++ /dev/null @@ -1,776 +0,0 @@ -
- Release 15.09 (<quote>Dingo</quote>, 2015/09/30) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - - - - - The Haskell - packages infrastructure has been re-designed from the ground up - (Haskell NG). NixOS now distributes the latest - version of every single package registered on - Hackage -- - well in excess of 8,000 Haskell packages. Detailed instructions - on how to use that infrastructure can be found in the - User’s - Guide to the Haskell Infrastructure. Users migrating from - an earlier release may find helpful information below, in the - list of backwards-incompatible changes. Furthermore, we - distribute 51(!) additional Haskell package sets that provide - every single LTS - Haskell release since version 0.0 as well as the most - recent Stackage - Nightly snapshot. The announcement - Full - Stackage Support in Nixpkgs gives additional - details. - - - - - Nix has been updated to version 1.10, which among other - improvements enables cryptographic signatures on binary caches - for improved security. - - - - - You can now keep your NixOS system up to date automatically by - setting - - - - -{ - system.autoUpgrade.enable = true; -} - - - This will cause the system to periodically check for updates in your - current channel and run nixos-rebuild. - - - - - This release is based on Glibc 2.21, GCC 4.9 and Linux 3.18. - - - - - GNOME has been upgraded to 3.16. - - - - - Xfce has been upgraded to 4.12. - - - - - KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and - Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. - - - - - E19 has been upgraded to 0.16.8.15. - - - - - The following new services were added since the last release: - - - - - services/mail/exim.nix - - - - - services/misc/apache-kafka.nix - - - - - services/misc/canto-daemon.nix - - - - - services/misc/confd.nix - - - - - services/misc/devmon.nix - - - - - services/misc/gitit.nix - - - - - services/misc/ihaskell.nix - - - - - services/misc/mbpfan.nix - - - - - services/misc/mediatomb.nix - - - - - services/misc/mwlib.nix - - - - - services/misc/parsoid.nix - - - - - services/misc/plex.nix - - - - - services/misc/ripple-rest.nix - - - - - services/misc/ripple-data-api.nix - - - - - services/misc/subsonic.nix - - - - - services/misc/sundtek.nix - - - - - services/monitoring/cadvisor.nix - - - - - services/monitoring/das_watchdog.nix - - - - - services/monitoring/grafana.nix - - - - - services/monitoring/riemann-tools.nix - - - - - services/monitoring/teamviewer.nix - - - - - services/network-filesystems/u9fs.nix - - - - - services/networking/aiccu.nix - - - - - services/networking/asterisk.nix - - - - - services/networking/bird.nix - - - - - services/networking/charybdis.nix - - - - - services/networking/docker-registry-server.nix - - - - - services/networking/fan.nix - - - - - services/networking/firefox/sync-server.nix - - - - - services/networking/gateone.nix - - - - - services/networking/heyefi.nix - - - - - services/networking/i2p.nix - - - - - services/networking/lambdabot.nix - - - - - services/networking/mstpd.nix - - - - - services/networking/nix-serve.nix - - - - - services/networking/nylon.nix - - - - - services/networking/racoon.nix - - - - - services/networking/skydns.nix - - - - - services/networking/shout.nix - - - - - services/networking/softether.nix - - - - - services/networking/sslh.nix - - - - - services/networking/tinc.nix - - - - - services/networking/tlsdated.nix - - - - - services/networking/tox-bootstrapd.nix - - - - - services/networking/tvheadend.nix - - - - - services/networking/zerotierone.nix - - - - - services/scheduling/marathon.nix - - - - - services/security/fprintd.nix - - - - - services/security/hologram.nix - - - - - services/security/munge.nix - - - - - services/system/cloud-init.nix - - - - - services/web-servers/shellinabox.nix - - - - - services/web-servers/uwsgi.nix - - - - - services/x11/unclutter.nix - - - - - services/x11/display-managers/sddm.nix - - - - - system/boot/coredump.nix - - - - - system/boot/loader/loader.nix - - - - - system/boot/loader/generic-extlinux-compatible - - - - - system/boot/networkd.nix - - - - - system/boot/resolved.nix - - - - - system/boot/timesyncd.nix - - - - - tasks/filesystems/exfat.nix - - - - - tasks/filesystems/ntfs.nix - - - - - tasks/filesystems/vboxsf.nix - - - - - virtualisation/virtualbox-host.nix - - - - - virtualisation/vmware-guest.nix - - - - - virtualisation/xen-dom0.nix - - - - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - sshd no longer supports DSA and ECDSA host - keys by default. If you have existing systems with such host - keys and want to continue to use them, please set - - - - -{ - system.stateVersion = "14.12"; -} - - - The new option system.stateVersion ensures that - certain configuration changes that could break existing systems - (such as the sshd host key setting) will maintain - compatibility with the specified NixOS release. NixOps sets the - state version of existing deployments automatically. - - - - - cron is no longer enabled by default, unless - you have a non-empty - services.cron.systemCronJobs. To force - cron to be enabled, set - services.cron.enable = true. - - - - - Nix now requires binary caches to be cryptographically signed. - If you have unsigned binary caches that you want to continue to - use, you should set - nix.requireSignedBinaryCaches = false. - - - - - Steam now doesn’t need root rights to work. Instead of using - *-steam-chrootenv, you should now just run - steam. steamChrootEnv - package was renamed to steam, and old - steam package -- to - steamOriginal. - - - - - CMPlayer has been renamed to bomi upstream. Package - cmplayer was accordingly renamed to - bomi - - - - - Atom Shell has been renamed to Electron upstream. Package - atom-shell was accordingly renamed to - electron - - - - - Elm is not released on Hackage anymore. You should now use - elmPackages.elm which contains the latest Elm - platform. - - - - - The CUPS printing service has been updated to version - 2.0.2. Furthermore its systemd service has - been renamed to cups.service. - - - Local printers are no longer shared or advertised by default. - This behavior can be changed by enabling - services.printing.defaultShared or - services.printing.browsing respectively. - - - - - The VirtualBox host and guest options have been named more - consistently. They can now found in - virtualisation.virtualbox.host.* instead of - services.virtualboxHost.* and - virtualisation.virtualbox.guest.* instead of - services.virtualboxGuest.*. - - - Also, there now is support for the vboxsf - file system using the fileSystems - configuration attribute. An example of how this can be used in a - configuration: - - - - -{ - fileSystems."/shiny" = { - device = "myshinysharedfolder"; - fsType = "vboxsf"; - }; -} - - - - - nix-env -qa no longer - discovers Haskell packages by name. The only packages visible in - the global scope are ghc, - cabal-install, and stack, - but all other packages are hidden. The reason for this - inconvenience is the sheer size of the Haskell package set. - Name-based lookups are expensive, and most - nix-env -qa operations would become much - slower if we’d add the entire Hackage database into the top - level attribute set. Instead, the list of Haskell packages can - be displayed by running: - - - - -nix-env -f "<nixpkgs>" -qaP -A haskellPackages - - - Executable programs written in Haskell can be installed with: - - -nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - - - Installing Haskell libraries this way, however, - is no longer supported. See the next item for more details. - - - - - Previous versions of NixOS came with a feature called - ghc-wrapper, a small script that allowed GHC - to transparently pick up on libraries installed in the user’s - profile. This feature has been deprecated; - ghc-wrapper was removed from the - distribution. The proper way to register Haskell libraries with - the compiler now is the - haskellPackages.ghcWithPackages function. The - User’s - Guide to the Haskell Infrastructure provides more - information about this subject. - - - - - All Haskell builds that have been generated with version 1.x of - the cabal2nix utility are now invalid and - need to be re-generated with a current version of - cabal2nix to function. The most recent - version of this tool can be installed by running - nix-env -i cabal2nix. - - - - - The haskellPackages set in Nixpkgs used to - have a function attribute called extension - that users could override in their - ~/.nixpkgs/config.nix files to configure - additional attributes, etc. That function still exists, but it’s - now called overrides. - - - - - The OpenBLAS library has been updated to version - 0.2.14. Support for the - x86_64-darwin platform was added. Dynamic - architecture detection was enabled; OpenBLAS now selects - microarchitecture-optimized routines at runtime, so optimal - performance is achieved without the need to rebuild OpenBLAS - locally. OpenBLAS has replaced ATLAS in most packages which use - an optimized BLAS or LAPACK implementation. - - - - - The phpfpm is now using the default PHP - version (pkgs.php) instead of PHP 5.4 - (pkgs.php54). - - - - - The locate service no longer indexes the Nix - store by default, preventing packages with potentially numerous - versions from cluttering the output. Indexing the store can be - activated by setting - services.locate.includeStore = true. - - - - - The Nix expression search path (NIX_PATH) no - longer contains /etc/nixos/nixpkgs by - default. You can override NIX_PATH by setting - nix.nixPath. - - - - - Python 2.6 has been marked as broken (as it no longer receives - security updates from upstream). - - - - - Any use of module arguments such as pkgs to - access library functions, or to define - imports attributes will now lead to an - infinite loop at the time of the evaluation. - - - In case of an infinite loop, use the - --show-trace command line argument and read - the line just above the error message. - - -$ nixos-rebuild build --show-trace -… -while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": -infinite recursion encountered - - - Any use of pkgs.lib, should be replaced by - lib, after adding it as argument of the - module. The following module - - -{ config, pkgs, ... }: - -with pkgs.lib; - -{ - options = { - foo = mkOption { … }; - }; - config = mkIf config.foo { … }; -} - - - should be modified to look like: - - -{ config, pkgs, lib, ... }: - -with lib; - -{ - options = { - foo = mkOption { option declaration }; - }; - config = mkIf config.foo { option definition }; -} - - - When pkgs is used to download other projects - to import their modules, and only in such cases, it should be - replaced by (import <nixpkgs> {}). The - following module - - -{ config, pkgs, ... }: - -let - myProject = pkgs.fetchurl { - src = url; - sha256 = hash; - }; -in - -{ - imports = [ "${myProject}/module.nix" ]; -} - - - should be modified to look like: - - -{ config, pkgs, ... }: - -let - myProject = (import <nixpkgs> {}).fetchurl { - src = url; - sha256 = hash; - }; -in - -{ - imports = [ "${myProject}/module.nix" ]; -} - - - - - Other notable improvements: - - - - - The nixos and nixpkgs channels were unified, so one - can use - nix-env -iA nixos.bash instead of - nix-env -iA nixos.pkgs.bash. See - the - commit for details. - - - - - Users running an SSH server who worry about the quality of their - /etc/ssh/moduli file with respect to the - vulnerabilities - discovered in the Diffie-Hellman key exchange can now - replace OpenSSH’s default version with one they generated - themselves using the new - services.openssh.moduliFile option. - - - - - A newly packaged TeX Live 2015 is provided in - pkgs.texlive, split into 6500 nix packages. - For basic user documentation see - the - source. Beware of - an - issue when installing a too large package set. The plan - is to deprecate and maybe delete the original TeX packages until - the next release. - - - - - buildEnv.env on all Python interpreters is - now available for nix-shell interoperability. - - - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml deleted file mode 100644 index 25b356e0aa6a..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml +++ /dev/null @@ -1,695 +0,0 @@ -
- Release 16.03 (<quote>Emu</quote>, 2016/03/31) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - - - - - Systemd 229, bringing - numerous - improvements over 217. - - - - - Linux 4.4 (was 3.18). - - - - - GCC 5.3 (was 4.9). Note that GCC 5 - changes - the C++ ABI in an incompatible way; this may cause - problems if you try to link objects compiled with different - versions of GCC. - - - - - Glibc 2.23 (was 2.21). - - - - - Binutils 2.26 (was 2.23.1). See #909 - - - - - Improved support for ensuring - bitwise - reproducible builds. For example, - stdenv now sets the environment variable - SOURCE_DATE_EPOCH to a deterministic value, - and Nix has - gained - an option to repeat a build a number of times to test - determinism. An ongoing project, the goal of exact - reproducibility is to allow binaries to be verified - independently (e.g., a user might only trust binaries that - appear in three independent binary caches). - - - - - Perl 5.22. - - - - - The following new services were added since the last release: - - - - - services/monitoring/longview.nix - - - - - hardware/video/webcam/facetimehd.nix - - - - - i18n/input-method/default.nix - - - - - i18n/input-method/fcitx.nix - - - - - i18n/input-method/ibus.nix - - - - - i18n/input-method/nabi.nix - - - - - i18n/input-method/uim.nix - - - - - programs/fish.nix - - - - - security/acme.nix - - - - - security/audit.nix - - - - - security/oath.nix - - - - - services/hardware/irqbalance.nix - - - - - services/mail/dspam.nix - - - - - services/mail/opendkim.nix - - - - - services/mail/postsrsd.nix - - - - - services/mail/rspamd.nix - - - - - services/mail/rmilter.nix - - - - - services/misc/autofs.nix - - - - - services/misc/bepasty.nix - - - - - services/misc/calibre-server.nix - - - - - services/misc/cfdyndns.nix - - - - - services/misc/gammu-smsd.nix - - - - - services/misc/mathics.nix - - - - - services/misc/matrix-synapse.nix - - - - - services/misc/octoprint.nix - - - - - services/monitoring/hdaps.nix - - - - - services/monitoring/heapster.nix - - - - - services/monitoring/longview.nix - - - - - services/network-filesystems/netatalk.nix - - - - - services/network-filesystems/xtreemfs.nix - - - - - services/networking/autossh.nix - - - - - services/networking/dnschain.nix - - - - - services/networking/gale.nix - - - - - services/networking/miniupnpd.nix - - - - - services/networking/namecoind.nix - - - - - services/networking/ostinato.nix - - - - - services/networking/pdnsd.nix - - - - - services/networking/shairport-sync.nix - - - - - services/networking/supplicant.nix - - - - - services/search/kibana.nix - - - - - services/security/haka.nix - - - - - services/security/physlock.nix - - - - - services/web-apps/pump.io.nix - - - - - services/x11/hardware/libinput.nix - - - - - services/x11/window-managers/windowlab.nix - - - - - system/boot/initrd-network.nix - - - - - system/boot/initrd-ssh.nix - - - - - system/boot/loader/loader.nix - - - - - system/boot/networkd.nix - - - - - system/boot/resolved.nix - - - - - virtualisation/lxd.nix - - - - - virtualisation/rkt.nix - - - - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - We no longer produce graphical ISO images and VirtualBox images - for i686-linux. A minimal ISO image is still - provided. - - - - - Firefox and similar browsers are now wrapped by - default. The package and attribute names are plain - firefox or midori, etc. - Backward-compatibility attributes were set up, but note that - nix-env -u will not - update your current firefox-with-plugins; you - have to uninstall it and install firefox - instead. - - - - - wmiiSnap has been replaced with - wmii_hg, but - services.xserver.windowManager.wmii.enable - has been updated respectively so this only affects you if you - have explicitly installed wmiiSnap. - - - - - jobs NixOS option has been removed. It served - as compatibility layer between Upstart jobs and SystemD - services. All services have been rewritten to use - systemd.services - - - - - wmiimenu is removed, as it has been removed - by the developers upstream. Use wimenu from - the wmii-hg package. - - - - - Gitit is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. - You will need to add an import statement to your NixOS - configuration in order to use it, e.g. - - -{ - imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; -} - - - will include the Gitit service configuration options. - - - - - nginx does not accept flags for enabling and - disabling modules anymore. Instead it accepts - modules argument, which is a list of modules - to be built in. All modules now reside in - nginxModules set. Example configuration: - - -nginx.override { - modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; -} - - - - - s3sync is removed, as it hasn’t been - developed by upstream for 4 years and only runs with ruby 1.8. - For an actively-developer alternative look at - tarsnap and others. - - - - - ruby_1_8 has been removed as it’s not - supported from upstream anymore and probably contains security - issues. - - - - - tidy-html5 package is removed. Upstream only - provided (lib)tidy5 during development, and - now they went back to (lib)tidy to work as a - drop-in replacement of the original package that has been - unmaintained for years. You can (still) use the - html-tidy package, which got updated to a - stable release from this new upstream. - - - - - extraDeviceOptions argument is removed from - bumblebee package. Instead there are now two - separate arguments: extraNvidiaDeviceOptions - and extraNouveauDeviceOptions for setting - extra X11 options for nvidia and nouveau drivers, respectively. - - - - - The Ctrl+Alt+Backspace key combination no - longer kills the X server by default. There’s a new option - services.xserver.enableCtrlAltBackspace - allowing to enable the combination again. - - - - - emacsPackagesNg now contains all packages - from the ELPA, MELPA, and MELPA Stable repositories. - - - - - Data directory for Postfix MTA server is moved from - /var/postfix to - /var/lib/postfix. Old configurations are - migrated automatically. service.postfix - module has also received many improvements, such as correct - directories’ access rights, new aliasFiles - and mapFiles options and more. - - - - - Filesystem options should now be configured as a list of - strings, not a comma-separated string. The old style will - continue to work, but print a warning, until the 16.09 release. - An example of the new style: - - -{ - fileSystems."/example" = { - device = "/dev/sdc"; - fsType = "btrfs"; - options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ]; - }; -} - - - - - CUPS, installed by services.printing module, - now has its data directory in /var/lib/cups. - Old configurations from /etc/cups are moved - there automatically, but there might be problems. Also - configuration options - services.printing.cupsdConf and - services.printing.cupsdFilesConf were removed - because they had been allowing one to override configuration - variables required for CUPS to work at all on NixOS. For most - use cases, services.printing.extraConf and - new option services.printing.extraFilesConf - should be enough; if you encounter a situation when they are - not, please file a bug. - - - There are also Gutenprint improvements; in particular, a new - option services.printing.gutenprint is added - to enable automatic updating of Gutenprint PPMs; it’s greatly - recommended to enable it instead of adding - gutenprint to the drivers - list. - - - - - services.xserver.vaapiDrivers has been - removed. Use - hardware.opengl.extraPackages{,32} instead. - You can also specify VDPAU drivers there. - - - - - programs.ibus moved to - i18n.inputMethod.ibus. The option - programs.ibus.plugins changed to - i18n.inputMethod.ibus.engines and the option - to enable ibus changed from - programs.ibus.enable to - i18n.inputMethod.enabled. - i18n.inputMethod.enabled should be set to the - used input method name, "ibus" for - ibus. An example of the new style: - - -{ - i18n.inputMethod.enabled = "ibus"; - i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; -} - - - That is equivalent to the old version: - - -{ - programs.ibus.enable = true; - programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; -} - - - - - services.udev.extraRules option now writes - rules to 99-local.rules instead of - 10-local.rules. This makes all the user rules - apply after others, so their results wouldn’t be overridden by - anything else. - - - - - Large parts of the services.gitlab module has - been been rewritten. There are new configuration options - available. The stateDir option was renamned - to statePath and the - satellitesDir option was removed. Please - review the currently available options. - - - - - The option - services.nsd.zones.<name>.data no - longer interpret the dollar sign ($) as a shell variable, as - such it should not be escaped anymore. Thus the following zone - data: - - -$ORIGIN example.com. -$TTL 1800 -@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - - - Should modified to look like the actual file expected by nsd: - - -$ORIGIN example.com. -$TTL 1800 -@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( - - - - - service.syncthing.dataDir options now has to - point to exact folder where syncthing is writing to. Example - configuration should look something like: - - -{ - services.syncthing = { - enable = true; - dataDir = "/home/somebody/.syncthing"; - user = "somebody"; - }; -} - - - - - networking.firewall.allowPing is now enabled - by default. Users are encouraged to configure an appropriate - rate limit for their machines using the Kernel interface at - /proc/sys/net/ipv4/icmp_ratelimit and - /proc/sys/net/ipv6/icmp/ratelimit or using - the firewall itself, i.e. by setting the NixOS option - networking.firewall.pingLimit. - - - - - Systems with some broadcom cards used to result into a generated - config that is no longer accepted. If you get errors like - - -error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created - - - you should either re-run - nixos-generate-config or manually replace - "${config.boot.kernelPackages.broadcom_sta}" - by config.boot.kernelPackages.broadcom_sta in - your /etc/nixos/hardware-configuration.nix. - More discussion is on - - the github issue. - - - - - The services.xserver.startGnuPGAgent option - has been removed. GnuPG 2.1.x changed the way the gpg-agent - works, and that new approach no longer requires (or even - supports) the start everything as a child of the - agent scheme we’ve implemented in NixOS for older - versions. To configure the gpg-agent for your X session, add the - following code to ~/.bashrc or some file - that’s sourced when your shell is started: - - -GPG_TTY=$(tty) -export GPG_TTY - - - If you want to use gpg-agent for SSH, too, add the following to - your session initialization (e.g. - displayManager.sessionCommands) - - - gpg-connect-agent /bye - unset SSH_AGENT_PID - export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" - - - and make sure that - - - enable-ssh-support - - - is included in your ~/.gnupg/gpg-agent.conf. - You will need to use ssh-add to re-add your - ssh keys. If gpg’s automatic transformation of the private keys - to the new format fails, you will need to re-import your private - keyring as well: - - - gpg --import ~/.gnupg/secring.gpg - - - The gpg-agent(1) man page has more details - about this subject, i.e. in the EXAMPLES section. - - - - - Other notable improvements: - - - - - ejabberd module is brought back and now works - on NixOS. - - - - - Input method support was improved. New NixOS modules (fcitx, - nabi and uim), fcitx engines (chewing, hangul, m17n, mozc and - table-other) and ibus engines (hangul and m17n) have been added. - - - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml deleted file mode 100644 index c2adbc88f5ca..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml +++ /dev/null @@ -1,273 +0,0 @@ -
- Release 16.09 (<quote>Flounder</quote>, 2016/09/30) - - In addition to numerous new and upgraded packages, this release has - the following highlights: - - - - - Many NixOS configurations and Nix packages now use significantly - less disk space, thanks to the - extensive - work on closure size reduction. For example, the closure - size of a minimal NixOS container went down from ~424 MiB in - 16.03 to ~212 MiB in 16.09, while the closure size of Firefox - went from ~651 MiB to ~259 MiB. - - - - - To improve security, packages are now - built - using various hardening features. See the Nixpkgs manual - for more information. - - - - - Support for PXE netboot. See - for documentation. - - - - - X.org server 1.18. If you use the ati_unfree - driver, 1.17 is still used due to an ABI incompatibility. - - - - - This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. - The default Linux kernel remains 4.4. - - - - - The following new services were added since the last release: - - - - - (this will get automatically generated at release time) - - - - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - A large number of packages have been converted to use the - multiple outputs feature of Nix to greatly reduce the amount of - required disk space, as mentioned above. This may require - changes to any custom packages to make them build again; see the - relevant chapter in the Nixpkgs manual for more information. - (Additional caveat to packagers: some packaging conventions - related to multiple-output packages - were - changed late (August 2016) in the release cycle and - differ from the initial introduction of multiple outputs.) - - - - - Previous versions of Nixpkgs had support for all versions of the - LTS Haskell package set. That support has been dropped. The - previously provided haskell.packages.lts-x_y - package sets still exist in name to aviod breaking user code, - but these package sets don’t actually contain the versions - mandated by the corresponding LTS release. Instead, our package - set it loosely based on the latest available LTS release, i.e. - LTS 7.x at the time of this writing. New releases of NixOS and - Nixpkgs will drop those old names entirely. - The - motivation for this change has been discussed at length - on the nix-dev mailing list and in - Github - issue #14897. Development strategies for Haskell hackers - who want to rely on Nix and NixOS have been described in - another - nix-dev article. - - - - - Shell aliases for systemd sub-commands - were - dropped: start, - stop, restart, - status. - - - - - Redis now binds to 127.0.0.1 only instead of listening to all - network interfaces. This is the default behavior of Redis 3.2 - - - - - /var/empty is now immutable. Activation - script runs chattr +i to forbid any - modifications inside the folder. See - - the pull request for what bugs this caused. - - - - - Gitlab’s maintainance script gitlab-runner - was removed and split up into the more clearer - gitlab-run and gitlab-rake - scripts, because gitlab-runner is a component - of Gitlab CI. - - - - - services.xserver.libinput.accelProfile - default changed from flat to - adaptive, as per - - official documentation. - - - - - fonts.fontconfig.ultimate.rendering was - removed because our presets were obsolete for some time. New - presets are hardcoded into FreeType; you can select a preset via - fonts.fontconfig.ultimate.preset. You can - customize those presets via ordinary environment variables, - using environment.variables. - - - - - The audit service is no longer enabled by - default. Use security.audit.enable = true to - explicitly enable it. - - - - - pkgs.linuxPackages.virtualbox now contains - only the kernel modules instead of the VirtualBox user space - binaries. If you want to reference the user space binaries, you - have to use the new pkgs.virtualbox instead. - - - - - goPackages was replaced with separated Go - applications in appropriate nixpkgs - categories. Each Go package uses its own dependency set. There’s - also a new go2nix tool introduced to generate - a Go package definition from its Go source automatically. - - - - - services.mongodb.extraConfig configuration - format was changed to YAML. - - - - - PHP has been upgraded to 7.0 - - - - - Other notable improvements: - - - - - Revamped grsecurity/PaX support. There is now only a single - general-purpose distribution kernel and the configuration - interface has been streamlined. Desktop users should be able to - simply set - - -{ - security.grsecurity.enable = true; -} - - - to get a reasonably secure system without having to sacrifice - too much functionality. - - - - - Special filesystems, like /proc, - /run and others, now have the same mount - options as recommended by systemd and are unified across - different places in NixOS. Mount options are updated during - nixos-rebuild switch if possible. One benefit - from this is improved security — most such filesystems are now - mounted with noexec, nodev - and/or nosuid options. - - - - - The reverse path filter was interfering with DHCPv4 server - operation in the past. An exception for DHCPv4 and a new option - to log packets that were dropped due to the reverse path filter - was added - (networking.firewall.logReversePathDrops) for - easier debugging. - - - - - Containers configuration within - containers.<name>.config is - now - properly typed and checked. In particular, partial - configurations are merged correctly. - - - - - The directory container setuid wrapper programs, - /var/setuid-wrappers, - is - now updated atomically to prevent failures if the switch to a - new configuration is interrupted. - - - - - services.xserver.startGnuPGAgent has been - removed due to GnuPG 2.1.x bump. See - - how to achieve similar behavior. You might need to - pkill gpg-agent after the upgrade to prevent - a stale agent being in the way. - - - - - - Declarative users could share the uid due to the bug in the - script handling conflict resolution. - - - - - Gummi boot has been replaced using systemd-boot. - - - - - Hydra package and NixOS module were added for convenience. - - - -
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml deleted file mode 100644 index 8667063f37e0..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml +++ /dev/null @@ -1,818 +0,0 @@ -
- Release 17.03 (<quote>Gorilla</quote>, 2017/03/31) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Nixpkgs is now extensible through overlays. See the - Nixpkgs - manual for more information. - - - - - This release is based on Glibc 2.25, GCC 5.4.0 and systemd - 232. The default Linux kernel is 4.9 and Nix is at 1.11.8. - - - - - The default desktop environment now is KDE’s Plasma 5. KDE 4 - has been removed - - - - - The setuid wrapper functionality now supports setting - capabilities. - - - - - X.org server uses branch 1.19. Due to ABI incompatibilities, - ati_unfree keeps forcing 1.17 and - amdgpu-pro starts forcing 1.18. - - - - - Cross compilation has been rewritten. See the nixpkgs manual - for details. The most obvious breaking change is that in - derivations there is no .nativeDrv nor - .crossDrv are now cross by default, not - native. - - - - - The overridePackages function has been - rewritten to be replaced by - - overlays - - - - - Packages in nixpkgs can be marked as insecure through listed - vulnerabilities. See the - Nixpkgs - manual for more information. - - - - - PHP now defaults to PHP 7.1 - - - -
-
- New Services - - The following new services were added since the last release: - - - - - hardware/ckb.nix - - - - - hardware/mcelog.nix - - - - - hardware/usb-wwan.nix - - - - - hardware/video/capture/mwprocapture.nix - - - - - programs/adb.nix - - - - - programs/chromium.nix - - - - - programs/gphoto2.nix - - - - - programs/java.nix - - - - - programs/mtr.nix - - - - - programs/oblogout.nix - - - - - programs/vim.nix - - - - - programs/wireshark.nix - - - - - security/dhparams.nix - - - - - services/audio/ympd.nix - - - - - services/computing/boinc/client.nix - - - - - services/continuous-integration/buildbot/master.nix - - - - - services/continuous-integration/buildbot/worker.nix - - - - - services/continuous-integration/gitlab-runner.nix - - - - - services/databases/riak-cs.nix - - - - - services/databases/stanchion.nix - - - - - services/desktops/gnome3/gnome-terminal-server.nix - - - - - services/editors/infinoted.nix - - - - - services/hardware/illum.nix - - - - - services/hardware/trezord.nix - - - - - services/logging/journalbeat.nix - - - - - services/mail/offlineimap.nix - - - - - services/mail/postgrey.nix - - - - - services/misc/couchpotato.nix - - - - - services/misc/docker-registry.nix - - - - - services/misc/errbot.nix - - - - - services/misc/geoip-updater.nix - - - - - services/misc/gogs.nix - - - - - services/misc/leaps.nix - - - - - services/misc/nix-optimise.nix - - - - - services/misc/ssm-agent.nix - - - - - services/misc/sssd.nix - - - - - services/monitoring/arbtt.nix - - - - - services/monitoring/netdata.nix - - - - - services/monitoring/prometheus/default.nix - - - - - services/monitoring/prometheus/alertmanager.nix - - - - - services/monitoring/prometheus/blackbox-exporter.nix - - - - - services/monitoring/prometheus/json-exporter.nix - - - - - services/monitoring/prometheus/nginx-exporter.nix - - - - - services/monitoring/prometheus/node-exporter.nix - - - - - services/monitoring/prometheus/snmp-exporter.nix - - - - - services/monitoring/prometheus/unifi-exporter.nix - - - - - services/monitoring/prometheus/varnish-exporter.nix - - - - - services/monitoring/sysstat.nix - - - - - services/monitoring/telegraf.nix - - - - - services/monitoring/vnstat.nix - - - - - services/network-filesystems/cachefilesd.nix - - - - - services/network-filesystems/glusterfs.nix - - - - - services/network-filesystems/ipfs.nix - - - - - services/networking/dante.nix - - - - - services/networking/dnscrypt-wrapper.nix - - - - - services/networking/fakeroute.nix - - - - - services/networking/flannel.nix - - - - - services/networking/htpdate.nix - - - - - services/networking/miredo.nix - - - - - services/networking/nftables.nix - - - - - services/networking/powerdns.nix - - - - - services/networking/pdns-recursor.nix - - - - - services/networking/quagga.nix - - - - - services/networking/redsocks.nix - - - - - services/networking/wireguard.nix - - - - - services/system/cgmanager.nix - - - - - services/torrent/opentracker.nix - - - - - services/web-apps/atlassian/confluence.nix - - - - - services/web-apps/atlassian/crowd.nix - - - - - services/web-apps/atlassian/jira.nix - - - - - services/web-apps/frab.nix - - - - - services/web-apps/nixbot.nix - - - - - services/web-apps/selfoss.nix - - - - - services/web-apps/quassel-webserver.nix - - - - - services/x11/unclutter-xfixes.nix - - - - - services/x11/urxvtd.nix - - - - - system/boot/systemd-nspawn.nix - - - - - virtualisation/ecs-agent.nix - - - - - virtualisation/lxcfs.nix - - - - - virtualisation/openstack/keystone.nix - - - - - virtualisation/openstack/glance.nix - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - Derivations have no .nativeDrv nor - .crossDrv and are now cross by default, not - native. - - - - - stdenv.overrides is now expected to take - self and super - arguments. See lib.trivial.extends for what - those parameters represent. - - - - - ansible now defaults to ansible version 2 - as version 1 has been removed due to a serious - - vulnerability unpatched by upstream. - - - - - gnome alias has been removed along with - gtk, gtkmm and several - others. Now you need to use versioned attributes, like - gnome3. - - - - - The attribute name of the Radicale daemon has been changed - from pythonPackages.radicale to - radicale. - - - - - The stripHash bash function in - stdenv changed according to its - documentation; it now outputs the stripped name to - stdout instead of putting it in the - variable strippedName. - - - - - PHP now scans for extra configuration .ini files in /etc/php.d - instead of /etc. This prevents accidentally loading non-PHP - .ini files that may be in /etc. - - - - - Two lone top-level dict dbs moved into - dictdDBs. This affects: - dictdWordnet which is now at - dictdDBs.wordnet and - dictdWiktionary which is now at - dictdDBs.wiktionary - - - - - Parsoid service now uses YAML configuration format. - service.parsoid.interwikis is now called - service.parsoid.wikis and is a list of - either API URLs or attribute sets as specified in parsoid’s - documentation. - - - - - Ntpd was replaced by - systemd-timesyncd as the default service to - synchronize system time with a remote NTP server. The old - behavior can be restored by setting - services.ntp.enable to - true. Upstream time servers for all NTP - implementations are now configured using - networking.timeServers. - - - - - service.nylon is now declared using named - instances. As an example: - - -{ - services.nylon = { - enable = true; - acceptInterface = "br0"; - bindInterface = "tun1"; - port = 5912; - }; -} - - - should be replaced with: - - -{ - services.nylon.myvpn = { - enable = true; - acceptInterface = "br0"; - bindInterface = "tun1"; - port = 5912; - }; -} - - - this enables you to declare a SOCKS proxy for each uplink. - - - - - overridePackages function no longer exists. - It is replaced by - - overlays. For example, the following code: - - -let - pkgs = import <nixpkgs> {}; -in - pkgs.overridePackages (self: super: ...) - - - should be replaced by: - - -let - pkgs = import <nixpkgs> {}; -in - import pkgs.path { overlays = [(self: super: ...)]; } - - - - - Autoloading connection tracking helpers is now disabled by - default. This default was also changed in the Linux kernel and - is considered insecure if not configured properly in your - firewall. If you need connection tracking helpers (i.e. for - active FTP) please enable - networking.firewall.autoLoadConntrackHelpers - and tune - networking.firewall.connectionTrackingModules - to suit your needs. - - - - - local_recipient_maps is not set to empty - value by Postfix service. It’s an insecure default as stated - by Postfix documentation. Those who want to retain this - setting need to set it via - services.postfix.extraConfig. - - - - - Iputils no longer provide ping6 and traceroute6. The - functionality of these tools has been integrated into ping and - traceroute respectively. To enforce an address family the new - flags -4 and -6 have - been added. One notable incompatibility is that specifying an - interface (for link-local IPv6 for instance) is no longer done - with the -I flag, but by encoding the - interface into the address - (ping fe80::1%eth0). - - - - - The socket handling of the services.rmilter - module has been fixed and refactored. As rmilter doesn’t - support binding to more than one socket, the options - bindUnixSockets and - bindInetSockets have been replaced by - services.rmilter.bindSocket.*. The default - is still a unix socket in - /run/rmilter/rmilter.sock. Refer to the - options documentation for more information. - - - - - The fetch* functions no longer support md5, - please use sha256 instead. - - - - - The dnscrypt-proxy module interface has been streamlined - around the extraArgs option. Where - possible, legacy option declarations are mapped to - extraArgs but will emit warnings. The - resolverList has been outright removed: to - use an unlisted resolver, use the - customResolver option. - - - - - torbrowser now stores local state under - ~/.local/share/tor-browser by default. Any - browser profile data from the old location, - ~/.torbrowser4, must be migrated manually. - - - - - The ihaskell, monetdb, offlineimap and sitecopy services have - been removed. - - - -
-
- Other Notable Changes - - - - Module type system have a new extensible option types feature - that allow to extend certain types, such as enum, through - multiple option declarations of the same option across - multiple modules. - - - - - jre now defaults to GTK UI by default. This - improves visual consistency and makes Java follow system font - style, improving the situation on HighDPI displays. This has a - cost of increased closure size; for server and other headless - workloads it’s recommended to use - jre_headless. - - - - - Python 2.6 interpreter and package set have been removed. - - - - - The Python 2.7 interpreter does not use modules anymore. - Instead, all CPython interpreters now include the whole - standard library except for `tkinter`, which is available in - the Python package set. - - - - - Python 2.7, 3.5 and 3.6 are now built deterministically and - 3.4 mostly. Minor modifications had to be made to the - interpreters in order to generate deterministic bytecode. This - has security implications and is relevant for those using - Python in a nix-shell. See the Nixpkgs - manual for details. - - - - - The Python package sets now use a fixed-point combinator and - the sets are available as attributes of the interpreters. - - - - - The Python function buildPythonPackage has - been improved and can be used to build from Setuptools source, - Flit source, and precompiled Wheels. - - - - - When adding new or updating current Python libraries, the - expressions should be put in separate files in - pkgs/development/python-modules and called - from python-packages.nix. - - - - - The dnscrypt-proxy service supports synchronizing the list of - public resolvers without working DNS resolution. This fixes - issues caused by the resolver list becoming outdated. It also - improves the viability of DNSCrypt only configurations. - - - - - Containers using bridged networking no longer lose their - connection after changes to the host networking. - - - - - ZFS supports pool auto scrubbing. - - - - - The bind DNS utilities (e.g. dig) have been split into their - own output and are now also available in - pkgs.dnsutils and it is no longer necessary - to pull in all of bind to use them. - - - - - Per-user configuration was moved from - ~/.nixpkgs to - ~/.config/nixpkgs. The former is still - valid for config.nix for backwards - compatibility. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml deleted file mode 100644 index 849ec868c783..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml +++ /dev/null @@ -1,922 +0,0 @@ -
- Release 17.09 (<quote>Hummingbird</quote>, 2017/09/??) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - The GNOME version is now 3.24. KDE Plasma was upgraded to - 5.10, KDE Applications to 17.08.1 and KDE Frameworks to 5.37. - - - - - The user handling now keeps track of deallocated UIDs/GIDs. - When a user or group is revived, this allows it to be - allocated the UID/GID it had before. A consequence is that - UIDs and GIDs are no longer reused. - - - - - The module option - services.xserver.xrandrHeads now causes the - first head specified in this list to be set as the primary - head. Apart from that, it’s now possible to also set - additional options by using an attribute set, for example: - - -{ services.xserver.xrandrHeads = [ - "HDMI-0" - { - output = "DVI-0"; - primary = true; - monitorConfig = '' - Option "Rotate" "right" - ''; - } - ]; -} - - - This will set the DVI-0 output to be the - primary head, even though HDMI-0 is the - first head in the list. - - - - - The handling of SSL in the services.nginx - module has been cleaned up, renaming the misnamed - enableSSL to onlySSL - which reflects its original intention. This is not to be used - with the already existing forceSSL which - creates a second non-SSL virtual host redirecting to the SSL - virtual host. This by chance had worked earlier due to - specific implementation details. In case you had specified - both please remove the enableSSL option to - keep the previous behaviour. - - - Another addSSL option has been introduced - to configure both a non-SSL virtual host and an SSL virtual - host with the same configuration. - - - Options to configure resolver options and - upstream blocks have been introduced. See - their information for further details. - - - The port option has been replaced by a more - generic listen option which makes it - possible to specify multiple addresses, ports and SSL configs - dependant on the new SSL handling mentioned above. - - - -
-
- New Services - - The following new services were added since the last release: - - - - - config/fonts/fontconfig-penultimate.nix - - - - - config/fonts/fontconfig-ultimate.nix - - - - - config/terminfo.nix - - - - - hardware/sensor/iio.nix - - - - - hardware/nitrokey.nix - - - - - hardware/raid/hpsa.nix - - - - - programs/browserpass.nix - - - - - programs/gnupg.nix - - - - - programs/qt5ct.nix - - - - - programs/slock.nix - - - - - programs/thefuck.nix - - - - - security/auditd.nix - - - - - security/lock-kernel-modules.nix - - - - - service-managers/docker.nix - - - - - service-managers/trivial.nix - - - - - services/admin/salt/master.nix - - - - - services/admin/salt/minion.nix - - - - - services/audio/slimserver.nix - - - - - services/cluster/kubernetes/default.nix - - - - - services/cluster/kubernetes/dns.nix - - - - - services/cluster/kubernetes/dashboard.nix - - - - - services/continuous-integration/hail.nix - - - - - services/databases/clickhouse.nix - - - - - services/databases/postage.nix - - - - - services/desktops/gnome3/gnome-disks.nix - - - - - services/desktops/gnome3/gpaste.nix - - - - - services/logging/SystemdJournal2Gelf.nix - - - - - services/logging/heartbeat.nix - - - - - services/logging/journalwatch.nix - - - - - services/logging/syslogd.nix - - - - - services/mail/mailhog.nix - - - - - services/mail/nullmailer.nix - - - - - services/misc/airsonic.nix - - - - - services/misc/autorandr.nix - - - - - services/misc/exhibitor.nix - - - - - services/misc/fstrim.nix - - - - - services/misc/gollum.nix - - - - - services/misc/irkerd.nix - - - - - services/misc/jackett.nix - - - - - services/misc/radarr.nix - - - - - services/misc/snapper.nix - - - - - services/monitoring/osquery.nix - - - - - services/monitoring/prometheus/collectd-exporter.nix - - - - - services/monitoring/prometheus/fritzbox-exporter.nix - - - - - services/network-filesystems/kbfs.nix - - - - - services/networking/dnscache.nix - - - - - services/networking/fireqos.nix - - - - - services/networking/iwd.nix - - - - - services/networking/keepalived/default.nix - - - - - services/networking/keybase.nix - - - - - services/networking/lldpd.nix - - - - - services/networking/matterbridge.nix - - - - - services/networking/squid.nix - - - - - services/networking/tinydns.nix - - - - - services/networking/xrdp.nix - - - - - services/security/shibboleth-sp.nix - - - - - services/security/sks.nix - - - - - services/security/sshguard.nix - - - - - services/security/torify.nix - - - - - services/security/usbguard.nix - - - - - services/security/vault.nix - - - - - services/system/earlyoom.nix - - - - - services/system/saslauthd.nix - - - - - services/web-apps/nexus.nix - - - - - services/web-apps/pgpkeyserver-lite.nix - - - - - services/web-apps/piwik.nix - - - - - services/web-servers/lighttpd/collectd.nix - - - - - services/web-servers/minio.nix - - - - - services/x11/display-managers/xpra.nix - - - - - services/x11/xautolock.nix - - - - - tasks/filesystems/bcachefs.nix - - - - - tasks/powertop.nix - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - In an Qemu-based virtualization - environment, the network interface names changed from i.e. - enp0s3 to - ens3. - - - This is due to a kernel configuration change. The new naming - is consistent with those of other Linux distributions with - systemd. See - #29197 - for more information. - - - A machine is affected if the virt-what tool - either returns qemu or - kvm and has interface - names used in any part of its NixOS configuration, in - particular if a static network configuration with - networking.interfaces is used. - - - Before rebooting affected machines, please ensure: - - - - - Change the interface names in your NixOS configuration. - The first interface will be called - ens3, the second one - ens8 and starting from there - incremented by 1. - - - - - After changing the interface names, rebuild your system - with nixos-rebuild boot to activate the - new configuration after a reboot. If you switch to the new - configuration right away you might lose network - connectivity! If using nixops, deploy - with nixops deploy --force-reboot. - - - - - - - The following changes apply if the - stateVersion is changed to 17.09 or higher. - For stateVersion = "17.03" or - lower the old behavior is preserved. - - - - - The postgres default version was - changed from 9.5 to 9.6. - - - - - The postgres superuser name has changed - from root to - postgres to more closely follow what - other Linux distributions are doing. - - - - - The postgres default - dataDir has changed from - /var/db/postgres to - /var/lib/postgresql/$psqlSchema where - $psqlSchema is 9.6 for example. - - - - - The mysql default - dataDir has changed from - /var/mysql to - /var/lib/mysql. - - - - - Radicale’s default package has changed from 1.x to 2.x. - Instructions to migrate can be found - here - . It is also possible to use the newer version by - setting the package to - radicale2, which is done automatically - when stateVersion is 17.09 or higher. - The extraArgs option has been added to - allow passing the data migration arguments specified in - the instructions; see the radicale.nix - NixOS test for an example migration. - - - - - - - The aiccu package was removed. This is due - to SixXS - sunsetting its IPv6 tunnel. - - - - - The fanctl package and - fan module have been removed due to the - developers not upstreaming their iproute2 patches and lagging - with compatibility to recent iproute2 versions. - - - - - Top-level idea package collection was - renamed. All JetBrains IDEs are now at - jetbrains. - - - - - flexget’s state database cannot be upgraded - to its new internal format, requiring removal of any existing - db-config.sqlite which will be - automatically recreated. - - - - - The ipfs service now doesn’t ignore the - dataDir option anymore. If you’ve ever set - this option to anything other than the default you’ll have to - either unset it (so the default gets used) or migrate the old - data manually with - - -dataDir=<valueOfDataDir> -mv /var/lib/ipfs/.ipfs/* $dataDir -rmdir /var/lib/ipfs/.ipfs - - - - - The caddy service was previously using an - extra .caddy directory in the data - directory specified with the dataDir - option. The contents of the .caddy - directory are now expected to be in the - dataDir. - - - - - The ssh-agent user service is not started - by default anymore. Use - programs.ssh.startAgent to enable it if - needed. There is also a new - programs.gnupg.agent module that creates a - gpg-agent user service. It can also serve - as a SSH agent if enableSSHSupport is set. - - - - - The - services.tinc.networks.<name>.listenAddress - option had a misleading name that did not correspond to its - behavior. It now correctly defines the ip to listen for - incoming connections on. To keep the previous behaviour, use - services.tinc.networks.<name>.bindToAddress - instead. Refer to the description of the options for more - details. - - - - - tlsdate package and module were removed. - This is due to the project being dead and not building with - openssl 1.1. - - - - - wvdial package and module were removed. - This is due to the project being dead and not building with - openssl 1.1. - - - - - cc-wrappers setup-hook now exports a - number of environment variables corresponding to binutils - binaries, (e.g. LD, - STRIP, RANLIB, etc). - This is done to prevent packages build systems - guessing, which is harder to predict, especially when - cross-compiling. However, some packages have broken due to - this—their build systems either not supporting, or claiming to - support without adequate testing, taking such environment - variables as parameters. - - - - - services.firefox.syncserver now runs by - default as a non-root user. To accommodate this change, the - default sqlite database location has also been changed. - Migration should work automatically. Refer to the description - of the options for more details. - - - - - The compiz window manager and package was - removed. The system support had been broken for several years. - - - - - Touchpad support should now be enabled through - libinput as synaptics is - now deprecated. See the option - services.xserver.libinput.enable. - - - - - grsecurity/PaX support has been dropped, following upstream’s - decision to cease free support. See - - upstream’s announcement for more information. No - complete replacement for grsecurity/PaX is available - presently. - - - - - services.mysql now has declarative - configuration of databases and users with the - ensureDatabases and - ensureUsers options. - - - These options will never delete existing databases and users, - especially not when the value of the options are changed. - - - The MySQL users will be identified using - - Unix socket authentication. This authenticates the Unix - user with the same name only, and that without the need for a - password. - - - If you have previously created a MySQL root - user with a password, you will need to - add root user for unix socket - authentication before using the new options. This can be done - by running the following SQL script: - - -CREATE USER 'root'@'%' IDENTIFIED BY ''; -GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; -FLUSH PRIVILEGES; - --- Optionally, delete the password-authenticated user: --- DROP USER 'root'@'localhost'; - - - - - services.mysqlBackup now works by default - without any user setup, including for users other than - mysql. - - - By default, the mysql user is no longer the - user which performs the backup. Instead a system account - mysqlbackup is used. - - - The mysqlBackup service is also now using - systemd timers instead of cron. - - - Therefore, the services.mysqlBackup.period - option no longer exists, and has been replaced with - services.mysqlBackup.calendar, which is in - the format of - systemd.time(7). - - - If you expect to be sent an e-mail when the backup fails, - consider using a script which monitors the systemd journal for - errors. Regretfully, at present there is no built-in - functionality for this. - - - You can check that backups still work by running - systemctl start mysql-backup then - systemctl status mysql-backup. - - - - - Templated systemd services e.g - container@name are now handled currectly - when switching to a new configuration, resulting in them being - reloaded. - - - - - Steam: the newStdcpp parameter was removed - and should not be needed anymore. - - - - - Redis has been updated to version 4 which mandates a cluster - mass-restart, due to changes in the network handling, in order - to ensure compatibility with networks NATing traffic. - - - -
-
- Other Notable Changes - - - - Modules can now be disabled by using - - disabledModules, allowing another to take it’s place. - This can be used to import a set of modules from another - channel while keeping the rest of the system on a stable - release. - - - - - Updated to FreeType 2.7.1, including a new TrueType engine. - The new engine replaces the Infinality engine which was the - default in NixOS. The default font rendering settings are now - provided by fontconfig-penultimate, replacing - fontconfig-ultimate; the new defaults are less invasive and - provide rendering that is more consistent with other systems - and hopefully with each font designer’s intent. Some - system-wide configuration has been removed from the Fontconfig - NixOS module where user Fontconfig settings are available. - - - - - ZFS/SPL have been updated to 0.7.0, - zfsUnstable, splUnstable have therefore - been removed. - - - - - The time.timeZone option now allows the - value null in addition to timezone strings. - This value allows changing the timezone of a system - imperatively using - timedatectl set-timezone. The default - timezone is still UTC. - - - - - Nixpkgs overlays may now be specified with a file as well as a - directory. The value of - <nixpkgs-overlays> may be a file, and - ~/.config/nixpkgs/overlays.nix can be used - instead of the ~/.config/nixpkgs/overlays - directory. - - - See the overlays chapter of the Nixpkgs manual for more - details. - - - - - Definitions for /etc/hosts can now be - specified declaratively with - networking.hosts. - - - - - Two new options have been added to the installer loader, in - addition to the default having changed. The kernel log - verbosity has been lowered to the upstream default for the - default options, in order to not spam the console when e.g. - joining a network. - - - This therefore leads to adding a new debug - option to set the log level to the previous verbose mode, to - make debugging easier, but still accessible easily. - - - Additionally a copytoram option has been - added, which makes it possible to remove the install medium - after booting. This allows tethering from your phone after - booting from it. - - - - - services.gitlab-runner.configOptions has - been added to specify the configuration of gitlab-runners - declaratively. - - - - - services.jenkins.plugins has been added to - install plugins easily, this can be generated with - jenkinsPlugins2nix. - - - - - services.postfix.config has been added to - specify the main.cf with NixOS options. Additionally other - options have been added to the postfix module and has been - improved further. - - - - - The GitLab package and module have been updated to the latest - 10.0 release. - - - - - The systemd-boot boot loader now lists the - NixOS version, kernel version and build date of all bootable - generations. - - - - - The dnscrypt-proxy service now defaults to using a random - upstream resolver, selected from the list of public - non-logging resolvers with DNSSEC support. Existing - configurations can be migrated to this mode of operation by - omitting the - services.dnscrypt-proxy.resolverName option - or setting it to "random". - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml deleted file mode 100644 index f197c52906b0..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ /dev/null @@ -1,879 +0,0 @@ -
- Release 18.03 (<quote>Impala</quote>, 2018/04/04) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - End of support is planned for end of October 2018, handing - over to 18.09. - - - - - Platform support: x86_64-linux and x86_64-darwin since release - time (the latter isn’t NixOS, really). Binaries for - aarch64-linux are available, but no channel exists yet, as - it’s waiting for some test fixes, etc. - - - - - Nix now defaults to 2.0; see its - release - notes. - - - - - Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> - 2.26, gcc: 6 -> 7, systemd: 234 -> 237. - - - - - Desktop version changes: gnome: 3.24 -> 3.26, (KDE) - plasma-desktop: 5.10 -> 5.12. - - - - - MariaDB 10.2, updated from 10.1, is now the default MySQL - implementation. While upgrading a few changes have been made - to the infrastructure involved: - - - - - libmysql has been deprecated, please - use mysql.connector-c instead, a - compatibility passthru has been added to the MySQL - packages. - - - - - The mysql57 package has a new - static output containing the static - libraries including libmysqld.a - - - - - - - PHP now defaults to PHP 7.2, updated from 7.1. - - - -
-
- New Services - - The following new services were added since the last release: - - - - - ./config/krb5/default.nix - - - - - ./hardware/digitalbitbox.nix - - - - - ./misc/label.nix - - - - - ./programs/ccache.nix - - - - - ./programs/criu.nix - - - - - ./programs/digitalbitbox/default.nix - - - - - ./programs/less.nix - - - - - ./programs/npm.nix - - - - - ./programs/plotinus.nix - - - - - ./programs/rootston.nix - - - - - ./programs/systemtap.nix - - - - - ./programs/sway.nix - - - - - ./programs/udevil.nix - - - - - ./programs/way-cooler.nix - - - - - ./programs/yabar.nix - - - - - ./programs/zsh/zsh-autoenv.nix - - - - - ./services/backup/borgbackup.nix - - - - - ./services/backup/crashplan-small-business.nix - - - - - ./services/desktops/dleyna-renderer.nix - - - - - ./services/desktops/dleyna-server.nix - - - - - ./services/desktops/pipewire.nix - - - - - ./services/desktops/gnome3/chrome-gnome-shell.nix - - - - - ./services/desktops/gnome3/tracker-miners.nix - - - - - ./services/hardware/fwupd.nix - - - - - ./services/hardware/interception-tools.nix - - - - - ./services/hardware/u2f.nix - - - - - ./services/hardware/usbmuxd.nix - - - - - ./services/mail/clamsmtp.nix - - - - - ./services/mail/dkimproxy-out.nix - - - - - ./services/mail/pfix-srsd.nix - - - - - ./services/misc/gitea.nix - - - - - ./services/misc/home-assistant.nix - - - - - ./services/misc/ihaskell.nix - - - - - ./services/misc/logkeys.nix - - - - - ./services/misc/novacomd.nix - - - - - ./services/misc/osrm.nix - - - - - ./services/misc/plexpy.nix - - - - - ./services/misc/pykms.nix - - - - - ./services/misc/tzupdate.nix - - - - - ./services/monitoring/fusion-inventory.nix - - - - - ./services/monitoring/prometheus/exporters.nix - - - - - ./services/network-filesystems/beegfs.nix - - - - - ./services/network-filesystems/davfs2.nix - - - - - ./services/network-filesystems/openafs/client.nix - - - - - ./services/network-filesystems/openafs/server.nix - - - - - ./services/network-filesystems/ceph.nix - - - - - ./services/networking/aria2.nix - - - - - ./services/networking/monero.nix - - - - - ./services/networking/nghttpx/default.nix - - - - - ./services/networking/nixops-dns.nix - - - - - ./services/networking/rxe.nix - - - - - ./services/networking/stunnel.nix - - - - - ./services/web-apps/matomo.nix - - - - - ./services/web-apps/restya-board.nix - - - - - ./services/web-servers/mighttpd2.nix - - - - - ./services/x11/fractalart.nix - - - - - ./system/boot/binfmt.nix - - - - - ./system/boot/grow-partition.nix - - - - - ./tasks/filesystems/ecryptfs.nix - - - - - ./virtualisation/hyperv-guest.nix - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - sound.enable now defaults to false. - - - - - Dollar signs in options under - services.postfix are passed verbatim to - Postfix, which will interpret them as the beginning of a - parameter expression. This was already true for string-valued - options in the previous release, but not for list-valued - options. If you need to pass literal dollar signs through - Postfix, double them. - - - - - The postage package (for web-based - PostgreSQL administration) has been renamed to - pgmanage. The corresponding module has also - been renamed. To migrate please rename all - services.postage options to - services.pgmanage. - - - - - Package attributes starting with a digit have been prefixed - with an underscore sign. This is to avoid quoting in the - configuration and other issues with command-line tools like - nix-env. The change affects the following - packages: - - - - - 2048-in-terminal → - _2048-in-terminal - - - - - 90secondportraits → - _90secondportraits - - - - - 2bwm → _2bwm - - - - - 389-ds-base → - _389-ds-base - - - - - - - The OpenSSH service no longer enables - support for DSA keys by default, which could cause a system - lock out. Update your keys or, unfavorably, re-enable DSA - support manually. - - - DSA support was - deprecated - in OpenSSH 7.0, due to it being too weak. To re-enable - support, add - PubkeyAcceptedKeyTypes +ssh-dss to the end - of your services.openssh.extraConfig. - - - After updating the keys to be stronger, anyone still on a - pre-17.03 version is safe to jump to 17.03, as vetted - here. - - - - - The openssh package now includes Kerberos - support by default; the - openssh_with_kerberos package is now a - deprecated alias. If you do not want Kerberos support, you can - do - openssh.override { withKerberos = false; }. - Note, this also applies to the openssh_hpn - package. - - - - - cc-wrapper has been split in two; there is - now also a bintools-wrapper. The most - commonly used files in nix-support are now - split between the two wrappers. Some commonly used ones, like - nix-support/dynamic-linker, are duplicated - for backwards compatability, even though they rightly belong - only in bintools-wrapper. Other more - obscure ones are just moved. - - - - - The propagation logic has been changed. The new logic, along - with new types of dependencies that go with, is thoroughly - documented in the Specifying dependencies - section of the Standard Environment chapter of - the nixpkgs manual. The old logic isn’t but is easy to - describe: dependencies were propagated as the same type of - dependency no matter what. In practice, that means that many - propagatedNativeBuildInputs should instead - be propagatedBuildInputs. Thankfully, that - was and is the least used type of dependency. Also, it means - that some propagatedBuildInputs should - instead be depsTargetTargetPropagated. - Other types dependencies should be unaffected. - - - - - lib.addPassthru drv passthru is removed. - Use lib.extendDerivation true passthru drv - instead. - - - - - The memcached service no longer accept - dynamic socket paths via - services.memcached.socket. Unix sockets can - be still enabled by - services.memcached.enableUnixSocket and - will be accessible at - /run/memcached/memcached.sock. - - - - - The hardware.amdHybridGraphics.disable - option was removed for lack of a maintainer. If you still need - this module, you may wish to include a copy of it from an - older version of nixos in your imports. - - - - - The merging of config options for - services.postfix.config was buggy. - Previously, if other options in the Postfix module like - services.postfix.useSrs were set and the - user set config options that were also set by such options, - the resulting config wouldn’t include all options that were - needed. They are now merged correctly. If config options need - to be overridden, lib.mkForce or - lib.mkOverride can be used. - - - - - The following changes apply if the - stateVersion is changed to 18.03 or higher. - For stateVersion = "17.09" or - lower the old behavior is preserved. - - - - - matrix-synapse uses postgresql by - default instead of sqlite. Migration instructions can be - found - - here . - - - - - - - The jid package has been removed, due to - maintenance overhead of a go package having non-versioned - dependencies. - - - - - When using services.xserver.libinput - (enabled by default in GNOME), it now handles all input - devices, not just touchpads. As a result, you might need to - re-evaluate any custom Xorg configuration. In particular, - Option "XkbRules" "base" - may result in broken keyboard layout. - - - - - The attic package was removed. A maintained - fork called - Borg - should be used instead. Migration instructions can be found - here. - - - - - The Piwik analytics software was renamed to Matomo: - - - - - The package pkgs.piwik was renamed to - pkgs.matomo. - - - - - The service services.piwik was renamed - to services.matomo. - - - - - The data directory /var/lib/piwik was - renamed to /var/lib/matomo. All files - will be moved automatically on first startup, but you - might need to adjust your backup scripts. - - - - - The default serverName for the nginx - configuration changed from - piwik.${config.networking.hostName} to - matomo.${config.networking.hostName}.${config.networking.domain} - if config.networking.domain is set, - matomo.${config.networking.hostName} if - it is not set. If you change your - serverName, remember you’ll need to - update the trustedHosts[] array in - /var/lib/matomo/config/config.ini.php - as well. - - - - - The piwik user was renamed to - matomo. The service will adjust - ownership automatically for files in the data directory. - If you use unix socket authentication, remember to give - the new matomo user access to the - database and to change the username to - matomo in the - [database] section of - /var/lib/matomo/config/config.ini.php. - - - - - If you named your database `piwik`, you might want to - rename it to `matomo` to keep things clean, but this is - neither enforced nor required. - - - - - - - nodejs-4_x is end-of-life. - nodejs-4_x, - nodejs-slim-4_x and - nodePackages_4_x are removed. - - - - - The pump.io NixOS module was removed. It is - now maintained as an - external - module. - - - - - The Prosody XMPP server has received a major update. The - following modules were renamed: - - - - - services.prosody.modules.httpserver is - now services.prosody.modules.http_files - - - - - services.prosody.modules.console is now - services.prosody.modules.admin_telnet - - - - - Many new modules are now core modules, most notably - services.prosody.modules.carbons and - services.prosody.modules.mam. - - - The better-performing libevent backend is - now enabled by default. - - - withCommunityModules now passes through the - modules to services.prosody.extraModules. - Use withOnlyInstalledCommunityModules for - modules that should not be enabled directly, e.g - lib_ldap. - - - - - All prometheus exporter modules are now defined as submodules. - The exporters are configured using - services.prometheus.exporters. - - - -
-
- Other Notable Changes - - - - ZNC option services.znc.mutable now - defaults to true. That means that old - configuration is not overwritten by default when update to the - znc options are made. - - - - - The option - networking.wireless.networks.<name>.auth - has been added for wireless networks with WPA-Enterprise - authentication. There is also a new - extraConfig option to directly configure - wpa_supplicant and - hidden to connect to hidden networks. - - - - - In the module - networking.interfaces.<name> the - following options have been removed: - - - - - ipAddress - - - - - ipv6Address - - - - - prefixLength - - - - - ipv6PrefixLength - - - - - subnetMask - - - - - To assign static addresses to an interface the options - ipv4.addresses and - ipv6.addresses should be used instead. The - options ip4 and ip6 have - been renamed to ipv4.addresses - ipv6.addresses respectively. The new - options ipv4.routes and - ipv6.routes have been added to set up - static routing. - - - - - The option services.logstash.listenAddress - is now 127.0.0.1 by default. Previously the - default behaviour was to listen on all interfaces. - - - - - services.btrfs.autoScrub has been added, to - periodically check btrfs filesystems for data corruption. If - there’s a correct copy available, it will automatically repair - corrupted blocks. - - - - - displayManager.lightdm.greeters.gtk.clock-format. - has been added, the clock format string (as expected by - strftime, e.g. %H:%M) to use with the - lightdm gtk greeter panel. - - - If set to null the default clock format is used. - - - - - displayManager.lightdm.greeters.gtk.indicators - has been added, a list of allowed indicator modules to use - with the lightdm gtk greeter panel. - - - Built-in indicators include ~a11y, - ~language, ~session, - ~power, ~clock, - ~host, ~spacer. Unity - indicators can be represented by short name (e.g. - sound, power), service - file name, or absolute path. - - - If set to null the default indicators are - used. - - - In order to have the previous default configuration add - - -{ - services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ - "~host" "~spacer" - "~clock" "~spacer" - "~session" - "~language" - "~a11y" - "~power" - ]; -} - - - to your configuration.nix. - - - - - The NixOS test driver supports user services declared by - systemd.user.services. The methods - waitForUnit, - getUnitInfo, startJob - and stopJob provide an optional - $user argument for that purpose. - - - - - Enabling bash completion on NixOS, - programs.bash.enableCompletion, will now - also enable completion for the Nix command line tools by - installing the - nix-bash-completions - package. - - - - - The vim/kakoune plugin updater now reads from a CSV file: - check - pkgs/applications/editors/vim/plugins/vim-plugin-names - out to see the new format - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml deleted file mode 100644 index 4bbfa7be398e..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml +++ /dev/null @@ -1,941 +0,0 @@ -
- Release 18.09 (<quote>Jellyfish</quote>, 2018/10/05) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following notable updates: - - - - - End of support is planned for end of April 2019, handing over - to 19.03. - - - - - Platform support: x86_64-linux and x86_64-darwin as always. - Support for aarch64-linux is as with the previous releases, - not equivalent to the x86-64-linux release, but with efforts - to reach parity. - - - - - Nix has been updated to 2.1; see its - release - notes. - - - - - Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → - 2.27, gcc: 7 (unchanged), systemd: 237 → 239. - - - - - Desktop version changes: gnome: 3.26 → 3.28, (KDE) - plasma-desktop: 5.12 → 5.13. - - - - - Notable changes and additions for 18.09 include: - - - - - Support for wrapping binaries using - firejail has been added through - programs.firejail.wrappedBinaries. - - - For example - - -{ - programs.firejail = { - enable = true; - wrappedBinaries = { - firefox = "${lib.getBin pkgs.firefox}/bin/firefox"; - mpv = "${lib.getBin pkgs.mpv}/bin/mpv"; - }; - }; -} - - - This will place firefox and - mpv binaries in the global path wrapped by - firejail. - - - - - User channels are now in the default - NIX_PATH, allowing users to use their - personal nix-channel defined channels in - nix-build and nix-shell - commands, as well as in imports like - import <mychannel>. - - - For example - - -$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable -$ nix-channel --update -$ nix-build '<nixpkgsunstable>' -A gitFull -$ nix run -f '<nixpkgsunstable>' gitFull -$ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - - - -
-
- New Services - - A curated selection of new services that were added since the last - release: - - - - - The services.cassandra module has been - reworked and was rewritten from scratch. The service has - succeeding tests for the versions 2.1, 2.2, 3.0 and 3.11 of - Apache - Cassandra. - - - - - There is a new services.foundationdb module - for deploying - FoundationDB - clusters. - - - - - When enabled the iproute2 will copy the - files expected by ip route (e.g., - rt_tables) in - /etc/iproute2. This allows to write aliases - for routing tables for instance. - - - - - services.strongswan-swanctl is a modern - replacement for services.strongswan. You - can use either one of them to setup IPsec VPNs but not both at - the same time. - - - services.strongswan-swanctl uses the - swanctl - command which uses the modern - vici - Versatile IKE Configuration Interface. - The deprecated ipsec command used in - services.strongswan is using the legacy - stroke - configuration interface. - - - - - The new services.elasticsearch-curator - service periodically curates or manages, your Elasticsearch - indices and snapshots. - - - - - Every new services: - - - - - ./config/xdg/autostart.nix - - - - - ./config/xdg/icons.nix - - - - - ./config/xdg/menus.nix - - - - - ./config/xdg/mime.nix - - - - - ./hardware/brightnessctl.nix - - - - - ./hardware/onlykey.nix - - - - - ./hardware/video/uvcvideo/default.nix - - - - - ./misc/documentation.nix - - - - - ./programs/firejail.nix - - - - - ./programs/iftop.nix - - - - - ./programs/sedutil.nix - - - - - ./programs/singularity.nix - - - - - ./programs/xss-lock.nix - - - - - ./programs/zsh/zsh-autosuggestions.nix - - - - - ./services/admin/oxidized.nix - - - - - ./services/backup/duplicati.nix - - - - - ./services/backup/restic.nix - - - - - ./services/backup/restic-rest-server.nix - - - - - ./services/cluster/hadoop/default.nix - - - - - ./services/databases/aerospike.nix - - - - - ./services/databases/monetdb.nix - - - - - ./services/desktops/bamf.nix - - - - - ./services/desktops/flatpak.nix - - - - - ./services/desktops/zeitgeist.nix - - - - - ./services/development/bloop.nix - - - - - ./services/development/jupyter/default.nix - - - - - ./services/hardware/lcd.nix - - - - - ./services/hardware/undervolt.nix - - - - - ./services/misc/clipmenu.nix - - - - - ./services/misc/gitweb.nix - - - - - ./services/misc/serviio.nix - - - - - ./services/misc/safeeyes.nix - - - - - ./services/misc/sysprof.nix - - - - - ./services/misc/weechat.nix - - - - - ./services/monitoring/datadog-agent.nix - - - - - ./services/monitoring/incron.nix - - - - - ./services/networking/dnsdist.nix - - - - - ./services/networking/freeradius.nix - - - - - ./services/networking/hans.nix - - - - - ./services/networking/morty.nix - - - - - ./services/networking/ndppd.nix - - - - - ./services/networking/ocserv.nix - - - - - ./services/networking/owamp.nix - - - - - ./services/networking/quagga.nix - - - - - ./services/networking/shadowsocks.nix - - - - - ./services/networking/stubby.nix - - - - - ./services/networking/zeronet.nix - - - - - ./services/security/certmgr.nix - - - - - ./services/security/cfssl.nix - - - - - ./services/security/oauth2_proxy_nginx.nix - - - - - ./services/web-apps/virtlyst.nix - - - - - ./services/web-apps/youtrack.nix - - - - - ./services/web-servers/hitch/default.nix - - - - - ./services/web-servers/hydron.nix - - - - - ./services/web-servers/meguca.nix - - - - - ./services/web-servers/nginx/gitweb.nix - - - - - ./virtualisation/kvmgt.nix - - - - - ./virtualisation/qemu-guest-agent.nix - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - Some licenses that were incorrectly not marked as unfree now - are. This is the case for: - - - - - cc-by-nc-sa-20: Creative Commons Attribution Non - Commercial Share Alike 2.0 - - - - - cc-by-nc-sa-25: Creative Commons Attribution Non - Commercial Share Alike 2.5 - - - - - cc-by-nc-sa-30: Creative Commons Attribution Non - Commercial Share Alike 3.0 - - - - - cc-by-nc-sa-40: Creative Commons Attribution Non - Commercial Share Alike 4.0 - - - - - cc-by-nd-30: Creative Commons Attribution-No Derivative - Works v3.00 - - - - - msrla: Microsoft Research License Agreement - - - - - - - The deprecated services.cassandra module - has seen a complete rewrite. (See above.) - - - - - lib.strict is removed. Use - builtins.seq instead. - - - - - The clementine package points now to the - free derivation. clementineFree is removed - now and clementineUnfree points to the - package which is bundled with the unfree - libspotify package. - - - - - The netcat package is now taken directly - from OpenBSD’s libressl, instead of relying - on Debian’s fork. The new version should be very close to the - old version, but there are some minor differences. - Importantly, flags like -b, -q, -C, and -Z are no longer - accepted by the nc command. - - - - - The services.docker-registry.extraConfig - object doesn’t contain environment variables anymore. Instead - it needs to provide an object structure that can be mapped - onto the YAML configuration defined in - the - docker/distribution docs. - - - - - gnucash has changed from version 2.4 to - 3.x. If you’ve been using gnucash (version - 2.4) instead of gnucash26 (version 2.6) you - must open your Gnucash data file(s) with - gnucash26 and then save them to upgrade the - file format. Then you may use your data file(s) with Gnucash - 3.x. See the upgrade - documentation. - Gnucash 2.4 is still available under the attribute - gnucash24. - - - - - services.munge now runs as user (and group) - munge instead of root. Make sure the key - file is accessible to the daemon. - - - - - dockerTools.buildImage now uses - null as default value for - tag, which indicates that the nix output - hash will be used as tag. - - - - - The ELK stack: elasticsearch, - logstash and kibana has - been upgraded from 2.* to 6.3.*. The 2.* versions have been - unsupported - since last year so they have been removed. You can - still use the 5.* versions under the names - elasticsearch5, - logstash5 and kibana5. - - - The elastic beats: filebeat, - heartbeat, metricbeat - and packetbeat have had the same treatment: - they now target 6.3.* as well. The 5.* versions are available - under the names: filebeat5, - heartbeat5, metricbeat5 - and packetbeat5 - - - The ELK-6.3 stack now comes with - X-Pack - by default. Since X-Pack is licensed under the - Elastic - License the ELK packages now have an unfree license. To - use them you need to specify - allowUnfree = true; in your nixpkgs - configuration. - - - Fortunately there is also a free variant of the ELK stack - without X-Pack. The packages are available under the names: - elasticsearch-oss, - logstash-oss and - kibana-oss. - - - - - Options - boot.initrd.luks.devices.name.yubikey.ramfsMountPoint - boot.initrd.luks.devices.name.yubikey.storage.mountPoint - were removed. luksroot.nix module never - supported more than one YubiKey at a time anyway, hence those - options never had any effect. You should be able to remove - them from your config without any issues. - - - - - stdenv.system and system - in nixpkgs now refer to the host platform instead of the build - platform. For native builds this is not change, let alone a - breaking one. For cross builds, it is a breaking change, and - stdenv.buildPlatform.system can be used - instead for the old behavior. They should be using that - anyways for clarity. - - - - - Groups kvm and render - are introduced now, as systemd requires them. - - - -
-
- Other Notable Changes - - - - dockerTools.pullImage relies on image - digest instead of image tag to download the image. The - sha256 of a pulled image has to be updated. - - - - - lib.attrNamesToStr has been deprecated. Use - more specific concatenation - (lib.concat(Map)StringsSep) instead. - - - - - lib.addErrorContextToAttrs has been - deprecated. Use builtins.addErrorContext - directly. - - - - - lib.showVal has been deprecated. Use - lib.traceSeqN instead. - - - - - lib.traceXMLVal has been deprecated. Use - lib.traceValFn builtins.toXml instead. - - - - - lib.traceXMLValMarked has been deprecated. - Use - lib.traceValFn (x: str + builtins.toXML x) - instead. - - - - - The pkgs argument to NixOS modules can now - be set directly using nixpkgs.pkgs. - Previously, only the system, - config and overlays - arguments could be used to influence pkgs. - - - - - A NixOS system can now be constructed more easily based on a - preexisting invocation of Nixpkgs. For example: - - -{ - inherit (pkgs.nixos { - boot.loader.grub.enable = false; - fileSystems."/".device = "/dev/xvda1"; - }) toplevel kernel initialRamdisk manual; -} - - - This benefits evaluation performance, lets you write Nixpkgs - packages that depend on NixOS images and is consistent with a - deployment architecture that would be centered around Nixpkgs - overlays. - - - - - lib.traceValIfNot has been deprecated. Use - if/then/else and - lib.traceValSeq instead. - - - - - lib.traceCallXml has been deprecated. - Please complain if you use the function regularly. - - - - - The attribute lib.nixpkgsVersion has been - deprecated in favor of lib.version. Please - refer to the discussion in - NixOS/nixpkgs#39416 - for further reference. - - - - - lib.recursiveUpdateUntil was not acting - according to its specification. It has been fixed to act - according to the docstring, and a test has been added. - - - - - The module for security.dhparams has two - new options now: - - - - - security.dhparams.stateless - - - - Puts the generated Diffie-Hellman parameters into the - Nix store instead of managing them in a stateful manner - in /var/lib/dhparams. - - - - - - security.dhparams.defaultBitSize - - - - The default bit size to use for the generated - Diffie-Hellman parameters. - - - - - - - The path to the actual generated parameter files should now - be queried using - config.security.dhparams.params.name.path - because it might be either in the Nix store or in a - directory configured by - security.dhparams.path. - - - - - For developers: - - - Module implementers should not set a specific bit size in - order to let users configure it by themselves if they want - to have a different bit size than the default (2048). - - - An example usage of this would be: - - -{ config, ... }: - -{ - security.dhparams.params.myservice = {}; - environment.etc."myservice.conf".text = '' - dhparams = ${config.security.dhparams.params.myservice.path} - ''; -} - - - - - - networking.networkmanager.useDnsmasq has - been deprecated. Use - networking.networkmanager.dns instead. - - - - - The Kubernetes package has been bumped to major version 1.11. - Please consult the - release - notes for details on new features and api changes. - - - - - The option - services.kubernetes.apiserver.admissionControl - was renamed to - services.kubernetes.apiserver.enableAdmissionPlugins. - - - - - Recommended way to access the Kubernetes Dashboard is via - HTTPS (TLS) Therefore; public service port for the dashboard - has changed to 443 (container port 8443) and scheme to https. - - - - - The option - services.kubernetes.apiserver.address was - renamed to - services.kubernetes.apiserver.bindAddress. - Note that the default value has changed from 127.0.0.1 to - 0.0.0.0. - - - - - The option - services.kubernetes.apiserver.publicAddress - was not used and thus has been removed. - - - - - The option - services.kubernetes.addons.dashboard.enableRBAC - was renamed to - services.kubernetes.addons.dashboard.rbac.enable. - - - - - The Kubernetes Dashboard now has only minimal RBAC permissions - by default. If dashboard cluster-admin rights are desired, set - services.kubernetes.addons.dashboard.rbac.clusterAdmin - to true. On existing clusters, in order for the revocation of - privileges to take effect, the current ClusterRoleBinding for - kubernetes-dashboard must be manually removed: - kubectl delete clusterrolebinding kubernetes-dashboard - - - - - The programs.screen module provides allows - to configure /etc/screenrc, however the - module behaved fairly counterintuitive as the config exists, - but the package wasn’t available. Since 18.09 - pkgs.screen will be added to - environment.systemPackages. - - - - - The module services.networking.hostapd now - uses WPA2 by default. - - - - - s6Dns, s6Networking, - s6LinuxUtils and - s6PortableUtils renamed to - s6-dns, s6-networking, - s6-linux-utils and - s6-portable-utils respectively. - - - - - The module option nix.useSandbox is now - defaulted to true. - - - - - The config activation script of - nixos-rebuild now - reloads - all user units for each authenticated user. - - - - - The default display manager is now LightDM. To use SLiM set - services.xserver.displayManager.slim.enable - to true. - - - - - NixOS option descriptions are now automatically broken up into - individual paragraphs if the text contains two consecutive - newlines, so it’s no longer necessary to use - </para><para> to start a new - paragraph. - - - - - Top-level buildPlatform, - hostPlatform, and - targetPlatform in Nixpkgs are deprecated. - Please use their equivalents in stdenv - instead: stdenv.buildPlatform, - stdenv.hostPlatform, and - stdenv.targetPlatform. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml deleted file mode 100644 index ed26f2ba45d0..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml +++ /dev/null @@ -1,790 +0,0 @@ -
- Release 19.03 (<quote>Koi</quote>, 2019/04/11) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - End of support is planned for end of October 2019, handing - over to 19.09. - - - - - The default Python 3 interpreter is now CPython 3.7 instead of - CPython 3.6. - - - - - Added the Pantheon desktop environment. It can be enabled - through - services.xserver.desktopManager.pantheon.enable. - - - - By default, - services.xserver.desktopManager.pantheon - enables LightDM as a display manager, as pantheon’s screen - locking implementation relies on it. Because of that it is - recommended to leave LightDM enabled. If you’d like to - disable it anyway, set - services.xserver.displayManager.lightdm.enable - to false and enable your preferred - display manager. - - - - Also note that Pantheon’s LightDM greeter is not enabled by - default, because it has numerous issues in NixOS and isn’t - optimal for use here yet. - - - - - A major refactoring of the Kubernetes module has been - completed. Refactorings primarily focus on decoupling - components and enhancing security. Two-way TLS and RBAC has - been enabled by default for all components, which slightly - changes the way the module is configured. See: - for details. - - - - - There is now a set of confinement options - for systemd.services, which allows to - restrict services into a chroot 2 ed environment that only - contains the store paths from the runtime closure of the - service. - - - -
-
- New Services - - The following new services were added since the last release: - - - - - ./programs/nm-applet.nix - - - - - There is a new security.googleOsLogin - module for using - OS - Login to manage SSH access to Google Compute Engine - instances, which supersedes the imperative and broken - google-accounts-daemon used in - nixos/modules/virtualisation/google-compute-config.nix. - - - - - ./services/misc/beanstalkd.nix - - - - - There is a new services.cockroachdb module - for running CockroachDB databases. NixOS now ships with - CockroachDB 2.1.x as well, available on - x86_64-linux and - aarch64-linux. - - - - - ./security/duosec.nix - - - - - The PAM module - for Duo Security has been enabled for use. One can - configure it using the security.duosec - options along with the corresponding PAM option in - security.pam.services.<name?>.duoSecurity.enable. - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - The minimum version of Nix required to evaluate Nixpkgs is now - 2.0. - - - - - For users of NixOS 18.03 and 19.03, NixOS defaults to Nix - 2.0, but supports using Nix 1.11 by setting - nix.package = pkgs.nix1;. If this - option is set to a Nix 1.11 package, you will need to - either unset the option or upgrade it to Nix 2.0. - - - - - For users of NixOS 17.09, you will first need to upgrade - Nix by setting - nix.package = pkgs.nixStable2; and run - nixos-rebuild switch as the - root user. - - - - - For users of a daemon-less Nix installation on Linux or - macOS, you can upgrade Nix by running - curl -L https://nixos.org/nix/install | sh, - or prior to doing a channel update, running - nix-env -iA nix. If you have already - run a channel update and Nix is no longer able to evaluate - Nixpkgs, the error message printed should provide adequate - directions for upgrading Nix. - - - - - For users of the Nix daemon on macOS, you can upgrade Nix - by running - sudo -i sh -c 'nix-channel --update && nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon. - - - - - - - The buildPythonPackage function now sets - strictDeps = true to help distinguish - between native and non-native dependencies in order to improve - cross-compilation compatibility. Note however that this may - break user expressions. - - - - - The buildPythonPackage function now sets - LANG = C.UTF-8 to enable Unicode support. - The glibcLocales package is no longer - needed as a build input. - - - - - The Syncthing state and configuration data has been moved from - services.syncthing.dataDir to the newly - defined services.syncthing.configDir, which - default to - /var/lib/syncthing/.config/syncthing. This - change makes possible to share synced directories using ACLs - without Syncthing resetting the permission on every start. - - - - - The ntp module now has sane default - restrictions. If you’re relying on the previous defaults, - which permitted all queries and commands from all - firewall-permitted sources, you can set - services.ntp.restrictDefault and - services.ntp.restrictSource to - []. - - - - - Package rabbitmq_server is renamed to - rabbitmq-server. - - - - - The light module no longer uses setuid - binaries, but udev rules. As a consequence users of that - module have to belong to the video group in - order to use the executable (i.e. - users.users.yourusername.extraGroups = ["video"];). - - - - - Buildbot now supports Python 3 and its packages have been - moved to pythonPackages. The options - services.buildbot-master.package and - services.buildbot-worker.package can be - used to select the Python 2 or 3 version of the package. - - - - - Options - services.znc.confOptions.networks.name.userName - and - services.znc.confOptions.networks.name.modulePackages - were removed. They were never used for anything and can - therefore safely be removed. - - - - - Package wasm has been renamed - proglodyte-wasm. The package - wasm will be pointed to - ocamlPackages.wasm in 19.09, so make sure - to update your configuration if you want to keep - proglodyte-wasm - - - - - When the nixpkgs.pkgs option is set, NixOS - will no longer ignore the nixpkgs.overlays - option. The old behavior can be recovered by setting - nixpkgs.overlays = lib.mkForce [];. - - - - - OpenSMTPD has been upgraded to version 6.4.0p1. This release - makes backwards-incompatible changes to the configuration file - format. See man smtpd.conf for more - information on the new file format. - - - - - The versioned postgresql have been renamed - to use underscore number separators. For example, - postgresql96 has been renamed to - postgresql_9_6. - - - - - Package consul-ui and passthrough - consul.ui have been removed. The package - consul now uses upstream releases that - vendor the UI into the binary. See - #48714 - for details. - - - - - Slurm introduces the new option - services.slurm.stateSaveLocation, which is - now set to /var/spool/slurm by default - (instead of /var/spool). Make sure to move - all files to the new directory or to set the option - accordingly. - - - The slurmctld now runs as user slurm - instead of root. If you want to keep - slurmctld running as root, set - services.slurm.user = root. - - - The options services.slurm.nodeName and - services.slurm.partitionName are now sets - of strings to correctly reflect that fact that each of these - options can occour more than once in the configuration. - - - - - The solr package has been upgraded from - 4.10.3 to 7.5.0 and has undergone some major changes. The - services.solr module has been updated to - reflect these changes. Please review - http://lucene.apache.org/solr/ carefully before upgrading. - - - - - Package ckb is renamed to - ckb-next, and options - hardware.ckb.* are renamed to - hardware.ckb-next.*. - - - - - The option - services.xserver.displayManager.job.logToFile - which was previously set to true when using - the display managers lightdm, - sddm or xpra has been - reset to the default value (false). - - - - - Network interface indiscriminate NixOS firewall options - (networking.firewall.allow*) are now - preserved when also setting interface specific rules such as - networking.firewall.interfaces.en0.allow*. - These rules continue to use the pseudo device - default - (networking.firewall.interfaces.default.*), - and assigning to this pseudo device will override the - (networking.firewall.allow*) options. - - - - - The nscd service now disables all caching - of passwd and group - databases by default. This was interferring with the correct - functioning of the libnss_systemd.so module - which is used by systemd to manage uids and - usernames in the presence of DynamicUser= - in systemd services. This was already the default behaviour in - presence of services.sssd.enable = true - because nscd caching would interfere with - sssd in unpredictable ways as well. Because - we’re using nscd not for caching, but for convincing glibc to - find NSS modules in the nix store instead of an absolute path, - we have decided to disable caching globally now, as it’s - usually not the behaviour the user wants and can lead to - surprising behaviour. Furthermore, negative caching of host - lookups is also disabled now by default. This should fix the - issue of dns lookups failing in the presence of an unreliable - network. - - - If the old behaviour is desired, this can be restored by - setting the services.nscd.config option - with the desired caching parameters. - - -{ - services.nscd.config = - '' - server-user nscd - threads 1 - paranoia no - debug-level 0 - - enable-cache passwd yes - positive-time-to-live passwd 600 - negative-time-to-live passwd 20 - suggested-size passwd 211 - check-files passwd yes - persistent passwd no - shared passwd yes - - enable-cache group yes - positive-time-to-live group 3600 - negative-time-to-live group 60 - suggested-size group 211 - check-files group yes - persistent group no - shared group yes - - enable-cache hosts yes - positive-time-to-live hosts 600 - negative-time-to-live hosts 5 - suggested-size hosts 211 - check-files hosts yes - persistent hosts no - shared hosts yes - ''; -} - - - See - #50316 - for details. - - - - - GitLab Shell previously used the nix store paths for the - gitlab-shell command in its - authorized_keys file, which might stop - working after garbage collection. To circumvent that, we - regenerated that file on each startup. As - gitlab-shell has now been changed to use - /var/run/current-system/sw/bin/gitlab-shell, - this is not necessary anymore, but there might be leftover - lines with a nix store path. Regenerate the - authorized_keys file via - sudo -u git -H gitlab-rake gitlab:shell:setup - in that case. - - - - - The pam_unix account module is now loaded - with its control field set to required - instead of sufficient, so that later PAM - account modules that might do more extensive checks are being - executed. Previously, the whole account module verification - was exited prematurely in case a nss module provided the - account name to pam_unix. The LDAP and SSSD - NixOS modules already add their NSS modules when enabled. In - case your setup breaks due to some later PAM account module - previosuly shadowed, or failing NSS lookups, please file a - bug. You can get back the old behaviour by manually setting - security.pam.services.<name?>.text. - - - - - The pam_unix password module is now loaded - with its control field set to sufficient - instead of required, so that password - managed only by later PAM password modules are being executed. - Previously, for example, changing an LDAP account’s password - through PAM was not possible: the whole password module - verification was exited prematurely by - pam_unix, preventing - pam_ldap to manage the password as it - should. - - - - - fish has been upgraded to 3.0. It comes - with a number of improvements and backwards incompatible - changes. See the fish - release - notes for more information. - - - - - The ibus-table input method has had a change in config format, - which causes all previous settings to be lost. See - this - commit message for details. - - - - - NixOS module system type types.optionSet - and lib.mkOption argument - options are deprecated. Use - types.submodule instead. - (#54637) - - - - - matrix-synapse has been updated to version - 0.99. It will - no - longer generate a self-signed certificate on first - launch and will be - the - last version to accept self-signed certificates. As - such, it is now recommended to use a proper certificate - verified by a root CA (for example Let’s Encrypt). The new - manual chapter on - Matrix contains a working example of using nginx as a - reverse proxy in front of matrix-synapse, - using Let’s Encrypt certificates. - - - - - mailutils now works by default when - sendmail is not in a setuid wrapper. As a - consequence, the sendmailPath argument, - having lost its main use, has been removed. - - - - - graylog has been upgraded from version 2.* - to 3.*. Some setups making use of extraConfig (especially - those exposing Graylog via reverse proxies) need to be updated - as upstream removed/replaced some settings. See - Upgrading - Graylog for details. - - - - - The option users.ldap.bind.password was - renamed to users.ldap.bind.passwordFile, - and needs to be readable by the nslcd user. - Same applies to the new - users.ldap.daemon.rootpwmodpwFile option. - - - - - nodejs-6_x is end-of-life. - nodejs-6_x, - nodejs-slim-6_x and - nodePackages_6_x are removed. - - - -
-
- Other Notable Changes - - - - The services.matomo module gained the - option services.matomo.package which - determines the used Matomo version. - - - The Matomo module now also comes with the systemd service - matomo-archive-processing.service and a - timer that automatically triggers archive processing every - hour. This means that you can safely - - disable browser triggers for Matomo archiving at - Administration > System > General Settings. - - - Additionally, you can enable to - - delete old visitor logs at - Administration > System > Privacy, - but make sure that you run - systemctl start matomo-archive-processing.service - at least once without errors if you have already collected - data before, so that the reports get archived before the - source data gets deleted. - - - - - composableDerivation along with supporting - library functions has been removed. - - - - - The deprecated truecrypt package has been - removed and truecrypt attribute is now an - alias for veracrypt. VeraCrypt is - backward-compatible with TrueCrypt volumes. Note that - cryptsetup also supports loading TrueCrypt - volumes. - - - - - The Kubernetes DNS addons, kube-dns, has been replaced with - CoreDNS. This change is made in accordance with Kubernetes - making CoreDNS the official default starting from - Kubernetes - v1.11. Please beware that upgrading DNS-addon on - existing clusters might induce minor downtime while the - DNS-addon terminates and re-initializes. Also note that the - DNS-service now runs with 2 pod replicas by default. The - desired number of replicas can be configured using: - services.kubernetes.addons.dns.replicas. - - - - - The quassel-webserver package and module was removed from - nixpkgs due to the lack of maintainers. - - - - - The manual gained a - new chapter on self-hosting matrix-synapse - and riot-web , the most prevalent - server and client implementations for the - Matrix federated - communication network. - - - - - The astah-community package was removed from nixpkgs due to it - being discontinued and the downloads not being available - anymore. - - - - - The httpd service now saves log files with a .log file - extension by default for easier integration with the logrotate - service. - - - - - The owncloud server packages and httpd subservice module were - removed from nixpkgs due to the lack of maintainers. - - - - - It is possible now to uze ZRAM devices as general purpose - ephemeral block devices, not only as swap. Using more than 1 - device as ZRAM swap is no longer recommended, but is still - possible by setting zramSwap.swapDevices - explicitly. - - - ZRAM algorithm can be changed now. - - - Changes to ZRAM algorithm are applied during - nixos-rebuild switch, so make sure you have - enough swap space on disk to survive ZRAM device rebuild. - Alternatively, use - nixos-rebuild boot; reboot. - - - - - Flat volumes are now disabled by default in - hardware.pulseaudio. This has been done to - prevent applications, which are unaware of this feature, - setting their volumes to 100% on startup causing harm to your - audio hardware and potentially your ears. - - - - With this change application specific volumes are relative - to the master volume which can be adjusted independently, - whereas before they were absolute; meaning that in effect, - it scaled the device-volume with the volume of the loudest - application. - - - - - - The - ndppd - module now supports - all - config options provided by the current upstream version - as service options. Additionally the ndppd - package doesn’t contain the systemd unit configuration from - upstream anymore, the unit is completely configured by the - NixOS module now. - - - - - New installs of NixOS will default to the Redmine 4.x series - unless otherwise specified in - services.redmine.package while existing - installs of NixOS will default to the Redmine 3.x series. - - - - - The - Grafana - module now supports declarative - datasource - and dashboard provisioning. - - - - - The use of insecure ports on kubernetes has been deprecated. - Thus options: - services.kubernetes.apiserver.port and - services.kubernetes.controllerManager.port - has been renamed to .insecurePort, and - default of both options has changed to 0 (disabled). - - - - - Note that the default value of - services.kubernetes.apiserver.bindAddress - has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver - to be accessible from outside the master node itself. If the - apiserver insecurePort is enabled, it is strongly recommended - to only bind on the loopback interface. See: - services.kubernetes.apiserver.insecurebindAddress. - - - - - The option - services.kubernetes.apiserver.allowPrivileged - and - services.kubernetes.kubelet.allowPrivileged - now defaults to false. Disallowing privileged containers on - the cluster. - - - - - The kubernetes module does no longer add the kubernetes - package to environment.systemPackages - implicitly. - - - - - The intel driver has been removed from the - default list of - X.org - video drivers. The modesetting - driver should take over automatically, it is better maintained - upstream and has less problems with advanced X11 features. - This can lead to a change in the output names used by - xrandr. Some performance regressions on - some GPU models might happen. Some OpenCL and VA-API - applications might also break (Beignet seems to provide OpenCL - support with modesetting driver, too). - Kernel mode setting API does not support backlight control, so - xbacklight tool will not work; backlight - level can be controlled directly via /sys/ - or with brightnessctl. Users who need this - functionality more than multi-output XRandR are advised to add - `intel` to `videoDrivers` and report an issue (or provide - additional details in an existing one) - - - - - Openmpi has been updated to version 4.0.0, which removes some - deprecated MPI-1 symbols. This may break some older - applications that still rely on those symbols. An upgrade - guide can be found - here. - - - The nginx package now relies on OpenSSL 1.1 and supports TLS - 1.3 by default. You can set the protocols used by the nginx - service using - services.nginx.sslProtocols. - - - - - A new subcommand nixos-rebuild edit was - added. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml deleted file mode 100644 index 3bf83e1eccbd..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml +++ /dev/null @@ -1,1197 +0,0 @@ -
- Release 19.09 (<quote>Loris</quote>, 2019/10/09) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - End of support is planned for end of April 2020, handing over - to 20.03. - - - - - Nix has been updated to 2.3; see its - release - notes. - - - - - Core version changes: - - - systemd: 239 -> 243 - - - gcc: 7 -> 8 - - - glibc: 2.27 (unchanged) - - - linux: 4.19 LTS (unchanged) - - - openssl: 1.0 -> 1.1 - - - - - Desktop version changes: - - - plasma5: 5.14 -> 5.16 - - - gnome3: 3.30 -> 3.32 - - - - - PHP now defaults to PHP 7.3, updated from 7.2. - - - - - PHP 7.1 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 19.09 release. - - - - - The binfmt module is now easier to use. Additional systems can - be added through - boot.binfmt.emulatedSystems. For instance, - boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; - will set up binfmt interpreters for each of those listed - systems. - - - - - The installer now uses a less privileged - nixos user whereas before we logged in as - root. To gain root privileges use sudo -i - without a password. - - - - - We’ve updated to Xfce 4.14, which brings a new module - services.xserver.desktopManager.xfce4-14. - If you’d like to upgrade, please switch from the - services.xserver.desktopManager.xfce module - as it will be deprecated in a future release. They’re - incompatibilities with the current Xfce module; it doesn’t - support thunarPlugins and it isn’t - recommended to use - services.xserver.desktopManager.xfce and - services.xserver.desktopManager.xfce4-14 - simultaneously or to downgrade from Xfce 4.14 after upgrading. - - - - - The GNOME 3 desktop manager module sports an interface to - enable/disable core services, applications, and optional GNOME - packages like games. - - - - - services.gnome3.core-os-services.enable - - - - - services.gnome3.core-shell.enable - - - - - services.gnome3.core-utilities.enable - - - - - services.gnome3.games.enable - - - - - With these options we hope to give users finer grained control - over their systems. Prior to this change you’d either have to - manually disable options or use - environment.gnome3.excludePackages which - only excluded the optional applications. - environment.gnome3.excludePackages is now - unguarded, it can exclude any package installed with - environment.systemPackages in the GNOME 3 - module. - - - - - Orthogonal to the previous changes to the GNOME 3 desktop - manager module, we’ve updated all default services and - applications to match as close as possible to a default - reference GNOME 3 experience. - - - The following changes were enacted in - services.gnome3.core-utilities.enable - - - - - accerciser - - - - - dconf-editor - - - - - evolution - - - - - gnome-documents - - - - - gnome-nettool - - - - - gnome-power-manager - - - - - gnome-todo - - - - - gnome-tweaks - - - - - gnome-usage - - - - - gucharmap - - - - - nautilus-sendto - - - - - vinagre - - - - - cheese - - - - - geary - - - - - The following changes were enacted in - services.gnome3.core-shell.enable - - - - - gnome-color-manager - - - - - orca - - - - - services.avahi.enable - - - - - -
-
- New Services - - The following new services were added since the last release: - - - - - ./programs/dwm-status.nix - - - - - The new hardware.printers module allows to - declaratively configure CUPS printers via the - ensurePrinters and - ensureDefaultPrinter options. - ensurePrinters will never delete existing - printers, but will make sure that the given printers are - configured as declared. - - - - - There is a new - services.system-config-printer.enable - and - programs.system-config-printer.enable - module for the program of the same name. If you previously had - system-config-printer enabled through some - other means you should migrate to using one of these modules. - - - - - services.xserver.desktopManager.plasma5 - - - - - services.xserver.desktopManager.gnome3 - - - - - services.xserver.desktopManager.pantheon - - - - - services.xserver.desktopManager.mate - Note Mate uses - programs.system-config-printer as it - doesn’t use it as a service, but its graphical interface - directly. - - - - - - - services.blueman.enable - has been added. If you previously had blueman installed via - environment.systemPackages please migrate - to using the NixOS module, as this would result in an - insufficiently configured blueman. - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - Buildbot no longer supports Python 2, as support was dropped - upstream in version 2.0.0. Configurations may need to be - modified to make them compatible with Python 3. - - - - - PostgreSQL now uses /run/postgresql as its - socket directory instead of /tmp. So if you - run an application like eg. Nextcloud, where you need to use - the Unix socket path as the database host name, you need to - change it accordingly. - - - - - PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle - and has been removed. - - - - - The options - services.prometheus.alertmanager.user and - services.prometheus.alertmanager.group have - been removed because the alertmanager service is now using - systemd’s - - DynamicUser mechanism which obviates these options. - - - - - The NetworkManager systemd unit was renamed back from - network-manager.service to NetworkManager.service for better - compatibility with other applications expecting this name. The - same applies to ModemManager where modem-manager.service is - now called ModemManager.service again. - - - - - The services.nzbget.configFile and - services.nzbget.openFirewall options were - removed as they are managed internally by the nzbget. The - services.nzbget.dataDir option hadn’t - actually been used by the module for some time and so was - removed as cleanup. - - - - - The services.mysql.pidDir option was - removed, as it was only used by the wordpress apache-httpd - service to wait for mysql to have started up. This can be - accomplished by either describing a dependency on - mysql.service (preferred) or waiting for the (hardcoded) - /run/mysqld/mysql.sock file to appear. - - - - - The services.emby.enable module has been - removed, see services.jellyfin.enable - instead for a free software fork of Emby. See the Jellyfin - documentation: - - Migrating from Emby to Jellyfin - - - - - IPv6 Privacy Extensions are now enabled by default for - undeclared interfaces. The previous behaviour was quite - misleading — even though the default value for - networking.interfaces.*.preferTempAddress - was true, undeclared interfaces would not - prefer temporary addresses. Now, interfaces not mentioned in - the config will prefer temporary addresses. EUI64 addresses - can still be set as preferred by explicitly setting the option - to false for the interface in question. - - - - - Since Bittorrent Sync was superseded by Resilio Sync in 2016, - the bittorrentSync, - bittorrentSync14, and - bittorrentSync16 packages have been removed - in favor of resilio-sync. - - - The corresponding module, services.btsync - has been replaced by the services.resilio - module. - - - - - The httpd service no longer attempts to start the postgresql - service. If you have come to depend on this behaviour then you - can preserve the behavior with the following configuration: - systemd.services.httpd.after = [ "postgresql.service" ]; - - - The option services.httpd.extraSubservices - has been marked as deprecated. You may still use this feature, - but it will be removed in a future release of NixOS. You are - encouraged to convert any httpd subservices you may have - written to a full NixOS module. - - - Most of the httpd subservices packaged with NixOS have been - replaced with full NixOS modules including LimeSurvey, - WordPress, and Zabbix. These modules can be enabled using the - services.limesurvey.enable, - services.mediawiki.enable, - services.wordpress.enable, and - services.zabbixWeb.enable options. - - - - - The option - systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnlink - was renamed to - systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnLink - (capital L). This follows - - upstreams renaming of the setting. - - - - - As of this release the NixOps feature - autoLuks is deprecated. It no longer works - with our systemd version without manual intervention. - - - Whenever the usage of the module is detected the evaluation - will fail with a message explaining why and how to deal with - the situation. - - - A new knob named - nixops.enableDeprecatedAutoLuks has been - introduced to disable the eval failure and to acknowledge the - notice was received and read. If you plan on using the feature - please note that it might break with subsequent updates. - - - Make sure you set the _netdev option for - each of the file systems referring to block devices provided - by the autoLuks module. Not doing this might render the system - in a state where it doesn’t boot anymore. - - - If you are actively using the autoLuks - module please let us know in - issue - #62211. - - - - - The setopt declarations will be evaluated at the end of - /etc/zshrc, so any code in - programs.zsh.interactiveShellInit, - programs.zsh.loginShellInit - and - programs.zsh.promptInit - may break if it relies on those options being set. - - - - - The prometheus-nginx-exporter package now - uses the official exporter provided by NGINX Inc. Its metrics - are differently structured and are incompatible to the old - ones. For information about the metrics, have a look at the - official - repo. - - - - - The shibboleth-sp package has been updated - to version 3. It is largely backward compatible, for further - information refer to the - release - notes and - upgrade - guide. - - - Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has - been dropped. - - - - - By default, prometheus exporters are now run with - DynamicUser enabled. Exporters that need a - real user, now run under a separate user and group which - follow the pattern - <exporter-name>-exporter, instead of - the previous default nobody and - nogroup. Only some exporters are affected - by the latter, namely the exporters - dovecot, node, - postfix and varnish. - - - - - The ibus-qt package is not installed by - default anymore when - i18n.inputMethod.enabled - is set to ibus. If IBus support in Qt 4.x - applications is required, add the ibus-qt - package to your - environment.systemPackages - manually. - - - - - The CUPS Printing service now uses socket-based activation by - default, only starting when needed. The previous behavior can - be restored by setting - services.cups.startWhenNeeded to - false. - - - - - The services.systemhealth module has been - removed from nixpkgs due to lack of maintainer. - - - - - The services.mantisbt module has been - removed from nixpkgs due to lack of maintainer. - - - - - Squid 3 has been removed and the squid - derivation now refers to Squid 4. - - - - - The services.pdns-recursor.extraConfig - option has been replaced by - services.pdns-recursor.settings. The new - option allows setting extra configuration while being better - type-checked and mergeable. - - - - - No service depends on keys.target anymore - which is a systemd target that indicates if all - NixOps - keys were successfully uploaded. Instead, - <key-name>-key.service should be used - to define a dependency of a key in a service. The full issue - behind the keys.target dependency is - described at - NixOS/nixpkgs#67265. - - - The following services are affected by this: - - - - - services.dovecot2 - - - - - services.nsd - - - - - services.softether - - - - - services.strongswan - - - - - services.strongswan-swanctl - - - - - services.httpd - - - - - - - The security.acme.directory option has been - replaced by a read-only - security.acme.certs.<cert>.directory - option for each certificate you define. This will be a - subdirectory of /var/lib/acme. You can use - this read-only option to figure out where the certificates are - stored for a specific certificate. For example, the - services.nginx.virtualhosts.<name>.enableACME - option will use this directory option to find the certs for - the virtual host. - - - security.acme.preDelay and - security.acme.activationDelay options have - been removed. To execute a service before certificates are - provisioned or renewed add a - RequiredBy=acme-${cert}.service to any - service. - - - Furthermore, the acme module will not automatically add a - dependency on lighttpd.service anymore. If - you are using certficates provided by letsencrypt for - lighttpd, then you should depend on the certificate service - acme-${cert}.service> manually. - - - For nginx, the dependencies are still automatically managed - when - services.nginx.virtualhosts.<name>.enableACME - is enabled just like before. What changed is that nginx now - directly depends on the specific certificates that it needs, - instead of depending on the catch-all - acme-certificates.target. This target unit - was also removed from the codebase. This will mean nginx will - no longer depend on certificates it isn’t explicitly managing - and fixes a bug with certificate renewal ordering racing with - nginx restarting which could lead to nginx getting in a broken - state as described at - NixOS/nixpkgs#60180. - - - - - The old deprecated emacs package sets have - been dropped. What used to be called - emacsPackagesNg is now simply called - emacsPackages. - - - - - services.xserver.desktopManager.xterm is - now disabled by default if stateVersion is - 19.09 or higher. Previously the xterm desktopManager was - enabled when xserver was enabled, but it isn’t useful for all - people so it didn’t make sense to have any desktopManager - enabled default. - - - - - The WeeChat plugin - pkgs.weechatScripts.weechat-xmpp has been - removed as it doesn’t receive any updates from upstream and - depends on outdated Python2-based modules. - - - - - Old unsupported versions (logstash5, - kibana5, filebeat5, - heartbeat5, metricbeat5, - packetbeat5) of the ELK-stack and Elastic - beats have been removed. - - - - - For NixOS 19.03, both Prometheus 1 and 2 were available to - allow for a seamless transition from version 1 to 2 with - existing setups. Because Prometheus 1 is no longer developed, - it was removed. Prometheus 2 is now configured with - services.prometheus. - - - - - Citrix Receiver (citrix_receiver) has been - dropped in favor of Citrix Workspace - (citrix_workspace). - - - - - The services.gitlab module has had its - literal secret options - (services.gitlab.smtp.password, - services.gitlab.databasePassword, - services.gitlab.initialRootPassword, - services.gitlab.secrets.secret, - services.gitlab.secrets.db, - services.gitlab.secrets.otp and - services.gitlab.secrets.jws) replaced by - file-based versions - (services.gitlab.smtp.passwordFile, - services.gitlab.databasePasswordFile, - services.gitlab.initialRootPasswordFile, - services.gitlab.secrets.secretFile, - services.gitlab.secrets.dbFile, - services.gitlab.secrets.otpFile and - services.gitlab.secrets.jwsFile). This was - done so that secrets aren’t stored in the world-readable nix - store, but means that for each option you’ll have to create a - file with the same exact string, add File to - the end of the option name, and change the definition to a - string pointing to the corresponding file; e.g. - services.gitlab.databasePassword = "supersecurepassword" - becomes - services.gitlab.databasePasswordFile = "/path/to/secret_file" - where the file secret_file contains the - string supersecurepassword. - - - The state path (services.gitlab.statePath) - now has the following restriction: no parent directory can be - owned by any other user than root or the - user specified in services.gitlab.user; - i.e. if services.gitlab.statePath is set to - /var/lib/gitlab/state, - gitlab and all parent directories must be - owned by either root or the user specified - in services.gitlab.user. - - - - - The networking.useDHCP option is - unsupported in combination with - networking.useNetworkd in anticipation of - defaulting to it. It has to be set to false - and enabled per interface with - networking.interfaces.<name>.useDHCP = true; - - - - - The Twitter client corebird has been - dropped as - it - is discontinued and does not work against the new Twitter - API. Please use the fork cawbird - instead which has been adapted to the API changes and is still - maintained. - - - - - The nodejs-11_x package has been removed as - it’s EOLed by upstream. - - - - - Because of the systemd upgrade, systemd-timesyncd will no - longer work if system.stateVersion is not - set correctly. When upgrading from NixOS 19.03, please make - sure that system.stateVersion is set to - "19.03", or lower if the - installation dates back to an earlier version of NixOS. - - - - - Due to the short lifetime of non-LTS kernel releases package - attributes like linux_5_1, - linux_5_2 and linux_5_3 - have been removed to discourage dependence on specific non-LTS - kernel versions in stable NixOS releases. Going forward, - versioned attributes like linux_4_9 will - exist for LTS versions only. Please use - linux_latest or - linux_testing if you depend on non-LTS - releases. Keep in mind that linux_latest - and linux_testing will change versions - under the hood during the lifetime of a stable release and - might include breaking changes. - - - - - Because of the systemd upgrade, some network interfaces might - change their name. For details see - - upstream docs or - - our ticket. - - - -
-
- Other Notable Changes - - - - The documentation module gained an option - named documentation.nixos.includeAllModules - which makes the generated configuration.nix 5 manual page - include all options from all NixOS modules included in a given - configuration.nix configuration file. - Currently, it is set to false by default as - enabling it frequently prevents evaluation. But the plan is to - eventually have it set to true by default. - Please set it to true now in your - configuration.nix and fix all the bugs it - uncovers. - - - - - The vlc package gained support for - Chromecast streaming, enabled by default. TCP port 8010 must - be open for it to work, so something like - networking.firewall.allowedTCPPorts = [ 8010 ]; - may be required in your configuration. Also consider enabling - - Accelerated Video Playback for better transcoding - performance. - - - - - The following changes apply if the - stateVersion is changed to 19.09 or higher. - For stateVersion = "19.03" or - lower the old behavior is preserved. - - - - - solr.package defaults to - pkgs.solr_8. - - - - - - - The hunspellDicts.fr-any dictionary now - ships with fr_FR.{aff,dic} which is linked - to fr-toutesvariantes.{aff,dic}. - - - - - The mysql service now runs as - mysql user. Previously, systemd did execute - it as root, and mysql dropped privileges itself. This includes - ExecStartPre= and - ExecStartPost= phases. To accomplish that, - runtime and data directory setup was delegated to - RuntimeDirectory and tmpfiles. - - - - - With the upgrade to systemd version 242 the - systemd-timesyncd service is no longer - using DynamicUser=yes. In order for the - upgrade to work we rely on an activation script to move the - state from the old to the new directory. The older directory - (prior 19.09) was - /var/lib/private/systemd/timesync. - - - As long as the system.config.stateVersion - is below 19.09 the state folder will - migrated to its proper location - (/var/lib/systemd/timesync), if required. - - - - - The package avahi is now built to look up - service definitions from - /etc/avahi/services instead of its output - directory in the nix store. Accordingly the module - avahi now supports custom service - definitions via - services.avahi.extraServiceFiles, which are - then placed in the aforementioned directory. See - avahi.service5 for more information on custom service - definitions. - - - - - Since version 0.1.19, cargo-vendor honors - package includes that are specified in the - Cargo.toml file of Rust crates. - rustPlatform.buildRustPackage uses - cargo-vendor to collect and build dependent - crates. Since this change in cargo-vendor - changes the set of vendored files for most Rust packages, the - hash that use used to verify the dependencies, - cargoSha256, also changes. - - - The cargoSha256 hashes of all in-tree - derivations that use buildRustPackage have - been updated to reflect this change. However, third-party - derivations that use buildRustPackage may - have to be updated as well. - - - - - The consul package was upgraded past - version 1.5, so its deprecated legacy UI is - no longer available. - - - - - The default resample-method for PulseAudio has been changed - from the upstream default speex-float-1 to - speex-float-5. Be aware that low-powered - ARM-based and MIPS-based boards will struggle with this so - you’ll need to set - hardware.pulseaudio.daemon.config.resample-method - back to speex-float-1. - - - - - The phabricator package and associated - httpd.extraSubservice, as well as the - phd service have been removed from nixpkgs - due to lack of maintainer. - - - - - The mercurial - httpd.extraSubservice has been removed from - nixpkgs due to lack of maintainer. - - - - - The trac - httpd.extraSubservice has been removed from - nixpkgs because it was unmaintained. - - - - - The foswiki package and associated - httpd.extraSubservice have been removed - from nixpkgs due to lack of maintainer. - - - - - The tomcat-connector - httpd.extraSubservice has been removed from - nixpkgs. - - - - - It’s now possible to change configuration in - services.nextcloud - after the initial deploy since all config parameters are - persisted in an additional config file generated by the - module. Previously core configuration like database parameters - were set using their imperative installer after creating - /var/lib/nextcloud. - - - - - There exists now lib.forEach, which is like - map, but with arguments flipped. When - mapping function body spans many lines (or has nested - maps), it is often hard to follow which - list is modified. - - - Previous solution to this problem was either to use - lib.flip map idiom or extract that - anonymous mapping function to a named one. Both can still be - used but lib.forEach is preferred over - lib.flip map. - - - The /etc/sysctl.d/nixos.conf file - containing all the options set via - boot.kernel.sysctl - was moved to /etc/sysctl.d/60-nixos.conf, - as sysctl.d5 recommends prefixing all filenames in - /etc/sysctl.d with a two-digit number and a - dash to simplify the ordering of the files. - - - - - We now install the sysctl snippets shipped with systemd. - - - - - Loose reverse path filtering - - - - - Source route filtering - - - - - fq_codel as a packet scheduler (this - helps to fight bufferbloat) - - - - - This also configures the kernel to pass core dumps to - systemd-coredump, and restricts the SysRq - key combinations to the sync command only. These sysctl - snippets can be found in - /etc/sysctl.d/50-*.conf, and overridden via - boot.kernel.sysctl - (which will place the parameters in - /etc/sysctl.d/60-nixos.conf). - - - - - Core dumps are now processed by - systemd-coredump by default. - systemd-coredump behaviour can still be - modified via systemd.coredump.extraConfig. - To stick to the old behaviour (having the kernel dump to a - file called core in the working directory), - without piping it through systemd-coredump, - set systemd.coredump.enable to - false. - - - - - systemd.packages option now also supports - generators and shutdown scripts. Old - systemd.generator-packages option has been - removed. - - - - - The rmilter package was removed with - associated module and options due deprecation by upstream - developer. Use rspamd in proxy mode - instead. - - - - - systemd cgroup accounting via the - systemd.enableCgroupAccounting - option is now enabled by default. It now also enables the more - recent Block IO and IP accounting features. - - - - - We no longer enable custom font rendering settings with - fonts.fontconfig.penultimate.enable by - default. The defaults from fontconfig are sufficient. - - - - - The crashplan package and the - crashplan service have been removed from - nixpkgs due to crashplan shutting down the service, while the - crashplansb package and - crashplan-small-business service have been - removed from nixpkgs due to lack of maintainer. - - - The - redis - module was hardcoded to use the - redis user, /run/redis - as runtime directory and /var/lib/redis as - state directory. Note that the NixOS module for Redis now - disables kernel support for Transparent Huge Pages (THP), - because this features causes major performance problems for - Redis, e.g. (https://redis.io/topics/latency). - - - - - Using fonts.enableDefaultFonts adds a - default emoji font noto-fonts-emoji. - - - - - services.xserver.enable - - - - - programs.sway.enable - - - - - programs.way-cooler.enable - - - - - services.xrdp.enable - - - - - - - The altcoins categorization of packages has - been removed. You now access these packages at the top level, - ie. nix-shell -p dogecoin instead of - nix-shell -p altcoins.dogecoin, etc. - - - - - Ceph has been upgraded to v14.2.1. See the - release - notes for details. The mgr dashboard as well as osds - backed by loop-devices is no longer explicitly supported by - the package and module. Note: There’s been some issues with - python-cherrypy, which is used by the dashboard and prometheus - mgr modules (and possibly others), hence - 0000-dont-check-cherrypy-version.patch. - - - - - pkgs.weechat is now compiled against - pkgs.python3. Weechat also recommends - to use - Python3 in their docs. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml deleted file mode 100644 index 35fbb7447c70..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml +++ /dev/null @@ -1,1497 +0,0 @@ -
- Release 20.03 (<quote>Markhor</quote>, 2020.04/20) -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Support is planned until the end of October 2020, handing over - to 20.09. - - - - - Core version changes: - - - gcc: 8.3.0 -> 9.2.0 - - - glibc: 2.27 -> 2.30 - - - linux: 4.19 -> 5.4 - - - mesa: 19.1.5 -> 19.3.3 - - - openssl: 1.0.2u -> 1.1.1d - - - - - Desktop version changes: - - - plasma5: 5.16.5 -> 5.17.5 - - - kdeApplications: 19.08.2 -> 19.12.3 - - - gnome3: 3.32 -> 3.34 - - - pantheon: 5.0 -> 5.1.3 - - - - - Linux kernel is updated to branch 5.4 by default (from 4.19). - - - - - Grub is updated to 2.04, adding support for booting from F2FS - filesystems and Btrfs volumes using zstd compression. Note - that some users have been unable to boot after upgrading to - 2.04 - for more information, please see - this - discussion. - - - - - Postgresql for NixOS service now defaults to v11. - - - - - The graphical installer image starts the graphical session - automatically. Before you’d be greeted by a tty and asked to - enter systemctl start display-manager. It - is now possible to disable the display-manager from running by - selecting the Disable display-manager quirk - in the boot menu. - - - - - GNOME 3 has been upgraded to 3.34. Please take a look at their - Release - Notes for details. - - - - - If you enable the Pantheon Desktop Manager via - services.xserver.desktopManager.pantheon.enable, - we now default to also use - - Pantheon’s newly designed greeter . Contrary to NixOS’s - usual update policy, Pantheon will receive updates during the - cycle of NixOS 20.03 when backwards compatible. - - - - - By default zfs pools will now be trimmed on a weekly basis. - Trimming is only done on supported devices (i.e. NVME or SSDs) - and should improve throughput and lifetime of these devices. - It is controlled by the - services.zfs.trim.enable varname. The zfs - scrub service - (services.zfs.autoScrub.enable) and the zfs - autosnapshot service - (services.zfs.autoSnapshot.enable) are now - only enabled if zfs is set in - config.boot.initrd.supportedFilesystems or - config.boot.supportedFilesystems. These - lists will automatically contain zfs as soon as any zfs - mountpoint is configured in fileSystems. - - - - - nixos-option has been rewritten in C++, - speeding it up, improving correctness, and adding a - -r option which prints all options and - their values recursively. - - - - - services.xserver.desktopManager.default and - services.xserver.windowManager.default - options were replaced by a single - services.xserver.displayManager.defaultSession - option to improve support for upstream session files. If you - used something like: - - -{ - services.xserver.desktopManager.default = "xfce"; - services.xserver.windowManager.default = "icewm"; -} - - - you should change it to: - - -{ - services.xserver.displayManager.defaultSession = "xfce+icewm"; -} - - - - - The testing driver implementation in NixOS is now in Python - make-test-python.nix. This was done by - Jacek Galowicz - (@tfc), and - with the collaboration of Julian Stecklina - (@blitz) - and Jana Traue - (@jtraue). - All documentation has been updated to use this testing driver, - and a vast majority of the 286 tests in NixOS were ported to - python driver. In 20.09 the Perl driver implementation, - make-test.nix, is slated for removal. This - should give users of the NixOS integration framework a - transitory period to rewrite their tests to use the Python - implementation. Users of the Perl driver will see this warning - everytime they use it: - - -$ warning: Perl VM tests are deprecated and will be removed for 20.09. -Please update your tests to use the python test driver. -See https://github.com/NixOS/nixpkgs/pull/71684 for details. - - - API compatibility is planned to be kept for at least the next - release with the perl driver. - - - -
-
- New Services - - The following new services were added since the last release: - - - - - The kubernetes kube-proxy now supports a new hostname - configuration - services.kubernetes.proxy.hostname which - has to be set if the hostname of the node should be non - default. - - - - - UPower’s configuration is now managed by NixOS and can be - customized via services.upower. - - - - - To use Geary you should enable - programs.geary.enable - instead of just adding it to - environment.systemPackages. - It was created so Geary could function properly outside of - GNOME. - - - - - ./config/console.nix - - - - - ./hardware/brillo.nix - - - - - ./hardware/tuxedo-keyboard.nix - - - - - ./programs/bandwhich.nix - - - - - ./programs/bash-my-aws.nix - - - - - ./programs/liboping.nix - - - - - ./programs/traceroute.nix - - - - - ./services/backup/sanoid.nix - - - - - ./services/backup/syncoid.nix - - - - - ./services/backup/zfs-replication.nix - - - - - ./services/continuous-integration/buildkite-agents.nix - - - - - ./services/databases/victoriametrics.nix - - - - - ./services/desktops/gnome3/gnome-initial-setup.nix - - - - - ./services/desktops/neard.nix - - - - - ./services/games/openarena.nix - - - - - ./services/hardware/fancontrol.nix - - - - - ./services/mail/sympa.nix - - - - - ./services/misc/freeswitch.nix - - - - - ./services/misc/mame.nix - - - - - ./services/monitoring/do-agent.nix - - - - - ./services/monitoring/prometheus/xmpp-alerts.nix - - - - - ./services/network-filesystems/orangefs/server.nix - - - - - ./services/network-filesystems/orangefs/client.nix - - - - - ./services/networking/3proxy.nix - - - - - ./services/networking/corerad.nix - - - - - ./services/networking/go-shadowsocks2.nix - - - - - ./services/networking/ntp/openntpd.nix - - - - - ./services/networking/shorewall.nix - - - - - ./services/networking/shorewall6.nix - - - - - ./services/networking/spacecookie.nix - - - - - ./services/networking/trickster.nix - - - - - ./services/networking/v2ray.nix - - - - - ./services/networking/xandikos.nix - - - - - ./services/networking/yggdrasil.nix - - - - - ./services/web-apps/dokuwiki.nix - - - - - ./services/web-apps/gotify-server.nix - - - - - ./services/web-apps/grocy.nix - - - - - ./services/web-apps/ihatemoney - - - - - ./services/web-apps/moinmoin.nix - - - - - ./services/web-apps/trac.nix - - - - - ./services/web-apps/trilium.nix - - - - - ./services/web-apps/shiori.nix - - - - - ./services/web-servers/ttyd.nix - - - - - ./services/x11/picom.nix - - - - - ./services/x11/hardware/digimend.nix - - - - - ./services/x11/imwheel.nix - - - - - ./virtualisation/cri-o.nix - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - The dhcpcd package - - does not request IPv4 addresses for tap and bridge interfaces - anymore by default. In order to still get an address on - a bridge interface, one has to disable - networking.useDHCP and explicitly enable - networking.interfaces.<name>.useDHCP - on every interface, that should get an address via DHCP. This - way, dhcpcd is configured in an explicit way about which - interface to run on. - - - - - GnuPG is now built without support for a graphical passphrase - entry by default. Please enable the - gpg-agent user service via the NixOS option - programs.gnupg.agent.enable. Note that - upstream recommends using gpg-agent and - will spawn a gpg-agent on the first - invocation of GnuPG anyway. - - - - - The dynamicHosts option has been removed - from the - NetworkManager - module. Allowing (multiple) regular users to override host - entries affecting the whole system opens up a huge attack - vector. There seem to be very rare cases where this might be - useful. Consider setting system-wide host entries using - networking.hosts, - provide them via the DNS server in your network, or use - environment.etc - to add a file into - /etc/NetworkManager/dnsmasq.d reconfiguring - hostsdir. - - - - - The 99-main.network file was removed. - Matching all network interfaces caused many breakages, see - #18962 - and - #71106. - - - We already don’t support the global - networking.useDHCP, - networking.defaultGateway - and - networking.defaultGateway6 - options if - networking.useNetworkd - is enabled, but direct users to configure the per-device - networking.interfaces.<name>…. - options. - - - - - The stdenv now runs all bash with set -u, - to catch the use of undefined variables. Before, it itself - used set -u but was careful to unset it so - other packages’ code ran as before. Now, all bash code is held - to the same high standard, and the rather complex stateful - manipulation of the options can be discarded. - - - - - The SLIM Display Manager has been removed, as it has been - unmaintained since 2013. Consider migrating to a different - display manager such as LightDM (current default in NixOS), - SDDM, GDM, or using the startx module which uses Xinitrc. - - - - - The Way Cooler wayland compositor has been removed, as the - project has been officially canceled. There are no more - way-cooler attribute and - programs.way-cooler options. - - - - - The BEAM package set has been deleted. You will only find - there the different interpreters. You should now use the - different build tools coming with the languages with sandbox - mode disabled. - - - - - There is now only one Xfce package-set and module. This means - that attributes xfce4-14 and - xfceUnstable all now point to the latest - Xfce 4.14 packages. And in the future NixOS releases will be - the latest released version of Xfce available at the time of - the release’s development (if viable). - - - - - The - phpfpm - module now sets PrivateTmp=true in its - systemd units for better process isolation. If you rely on - /tmp being shared with other services, - explicitly override this by setting - serviceConfig.PrivateTmp to - false for each phpfpm unit. - - - - - KDE’s old multimedia framework Phonon no longer supports Qt 4. - For that reason, Plasma desktop also does not have - enableQt4Support option any more. - - - - - The BeeGFS module has been removed. - - - - - The osquery module has been removed. - - - - - Going forward, ~/bin in the users home - directory will no longer be in PATH by - default. If you depend on this you should set the option - environment.homeBinInPath to - true. The aforementioned option was added - this release. - - - - - The buildRustCrate infrastructure now - produces lib outputs in addition to the - out output. This has led to drastically - reduced closure sizes for some rust crates since development - dependencies are now in the lib output. - - - - - Pango was upgraded to 1.44, which no longer uses freetype for - font loading. This means that type1 and bitmap fonts are no - longer supported in applications relying on Pango for font - rendering (notably, GTK application). See - - upstream issue for more information. - - - - - The roundcube module has been hardened. - - - - - The password of the database is not written world readable - in the store any more. If database.host - is set to localhost, then a unix user - of the same name as the database will be created and - PostreSQL peer authentication will be used, removing the - need for a password. Otherwise, a password is still needed - and can be provided with the new option - database.passwordFile, which should be - set to the path of a file containing the password and - readable by the user nginx only. The - database.password option is insecure - and deprecated. Usage of this option will print a warning. - - - - - A random des_key is set by default in - the configuration of roundcube, instead of using the - hardcoded and insecure default. To ensure a clean - migration, all users will be logged out when you upgrade - to this release. - - - - - - - The packages openobex and - obexftp are no longer installed when - enabling Bluetooth via - hardware.bluetooth.enable. - - - - - The dump1090 derivation has been changed to - use FlightAware’s dump1090 as its upstream. However, this - version does not have an internal webserver anymore. The - assets in the share/dump1090 directory of - the derivation can be used in conjunction with an external - webserver to replace this functionality. - - - - - The fourStore and fourStoreEndpoint modules have been removed. - - - - - Polkit no longer has the user of uid 0 (root) as an admin - identity. We now follow the upstream default of only having - every member of the wheel group admin privileged. Before it - was root and members of wheel. The positive outcome of this is - pkexec GUI popups or terminal prompts will no longer require - the user to choose between two essentially equivalent choices - (whether to perform the action as themselves with wheel - permissions, or as the root user). - - - - - NixOS containers no longer build NixOS manual by default. This - saves evaluation time, especially if there are many - declarative containers defined. Note that this is already done - when - <nixos/modules/profiles/minimal.nix> - module is included in container config. - - - - - The kresd services deprecates the - interfaces option in favor of the - listenPlain option which requires full - systemd.socket - compatible declaration which always include a port. - - - - - Virtual console options have been reorganized and can be found - under a single top-level attribute: - console. The full set of changes is as - follows: - - - - - i18n.consoleFont renamed to - console.font - - - - - i18n.consoleKeyMap renamed to - console.keyMap - - - - - i18n.consoleColors renamed to - console.colors - - - - - i18n.consolePackages renamed to - console.packages - - - - - i18n.consoleUseXkbConfig renamed to - console.useXkbConfig - - - - - boot.earlyVconsoleSetup renamed to - console.earlySetup - - - - - boot.extraTTYs renamed to - console.extraTTYs. - - - - - - - The - awstats - module has been rewritten to serve stats via static html - pages, updated on a timer, over - nginx, - instead of dynamic cgi pages over - apache. - - - Minor changes will be required to migrate existing - configurations. Details of the required changes can seen by - looking through the - awstats - module. - - - - - The httpd module no longer provides options to support serving - web content without defining a virtual host. As a result of - this the - services.httpd.logPerVirtualHost - option now defaults to true instead of - false. Please update your configuration to - make use of - services.httpd.virtualHosts. - - - The - services.httpd.virtualHosts.<name> - option has changed type from a list of submodules to an - attribute set of submodules, better matching - services.nginx.virtualHosts.<name>. - - - This change comes with the addition of the following options - which mimic the functionality of their - nginx counterparts: - services.httpd.virtualHosts.<name>.addSSL, - services.httpd.virtualHosts.<name>.forceSSL, - services.httpd.virtualHosts.<name>.onlySSL, - services.httpd.virtualHosts.<name>.enableACME, - services.httpd.virtualHosts.<name>.acmeRoot, - and - services.httpd.virtualHosts.<name>.useACMEHost. - - - - - For NixOS configuration options, the loaOf - type has been deprecated and will be removed in a future - release. In nixpkgs, options of this type will be changed to - attrsOf instead. If you were using one of - these in your configuration, you will see a warning suggesting - what changes will be required. - - - For example, - users.users - is a loaOf option that is commonly used as - follows: - - -{ - users.users = - [ { name = "me"; - description = "My personal user."; - isNormalUser = true; - } - ]; -} - - - This should be rewritten by removing the list and using the - value of name as the name of the attribute - set: - - -{ - users.users.me = - { description = "My personal user."; - isNormalUser = true; - }; -} - - - For more information on this change have look at these links: - issue - #1800, - PR - #63103. - - - - - For NixOS modules, the types - types.submodule and - types.submoduleWith now support paths as - allowed values, similar to how imports - supports paths. Because of this, if you have a module that - defines an option of type - either (submodule ...) path, it will break - since a path is now treated as the first type instead of the - second. To fix this, change the type to - either path (submodule ...). - - - - - The - Buildkite - Agent module and corresponding packages have been - updated to 3.x, and to support multiple instances of the agent - running at the same time. This means you will have to rename - services.buildkite-agent to - services.buildkite-agents.<name>. - Furthermore, the following options have been changed: - - - - - services.buildkite-agent.meta-data has - been renamed to - services.buildkite-agents.<name>.tags, - to match upstreams naming for 3.x. Its type has also - changed - it now accepts an attrset of strings. - - - - - Theservices.buildkite-agent.openssh.publicKeyPath - option has been removed, as it’s not necessary to deploy - public keys to clone private repositories. - - - - - services.buildkite-agent.openssh.privateKeyPath - has been renamed to - buildkite-agents.<name>.privateSshKeyPath, - as the whole openssh now only contained - that single option. - - - - - services.buildkite-agents.<name>.shell - has been introduced, allowing to specify a custom shell to - be used. - - - - - - - The citrix_workspace_19_3_0 package has - been removed as it will be EOLed within the lifespan of 20.03. - For further information, please refer to the - support - and maintenance information from upstream. - - - - - The gcc5 and gfortran5 - packages have been removed. - - - - - The services.xserver.displayManager.auto - module has been removed. It was only intended for use in - internal NixOS tests, and gave the false impression of it - being a special display manager when it’s actually LightDM. - Please use the - services.xserver.displayManager.lightdm.autoLogin - options instead, or any other display manager in NixOS as they - all support auto-login. If you used this module specifically - because it permitted root auto-login you can override the - lightdm-autologin pam module like: - - -{ - security.pam.services.lightdm-autologin.text = lib.mkForce '' - auth requisite pam_nologin.so - auth required pam_succeed_if.so quiet - auth required pam_permit.so - - account include lightdm - - password include lightdm - - session include lightdm - ''; -} - - - The difference is the: - - -auth required pam_succeed_if.so quiet - - - line, where default it’s: - - - auth required pam_succeed_if.so uid >= 1000 quiet - - - not permitting users with uid’s below 1000 (like root). All - other display managers in NixOS are configured like this. - - - - - There have been lots of improvements to the Mailman module. As - a result, - - - - - The services.mailman.hyperkittyBaseUrl - option has been renamed to - services.mailman.hyperkitty.baseUrl. - - - - - The services.mailman.hyperkittyApiKey - option has been removed. This is because having an option - for the Hyperkitty API key meant that the API key would be - stored in the world-readable Nix store, which was a - security vulnerability. A new Hyperkitty API key will be - generated the first time the new Hyperkitty service is - run, and it will then be persisted outside of the Nix - store. To continue using Hyperkitty, you must set - services.mailman.hyperkitty.enable - to true. - - - - - Additionally, some Postfix configuration must now be set - manually instead of automatically by the Mailman module: - - -{ - services.postfix.relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; - services.postfix.config.transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; - services.postfix.config.local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; -} - - - This is because some users may want to include other - values in these lists as well, and this was not possible - if they were set automatically by the Mailman module. It - would not have been possible to just concatenate values - from multiple modules each setting the values they needed, - because the order of elements in the list is significant. - - - - - - - The LLVM versions 3.5, 3.9 and 4 (including the corresponding - CLang versions) have been dropped. - - - - - The - networking.interfaces.*.preferTempAddress - option has been replaced by - networking.interfaces.*.tempAddress. The - new option allows better control of the IPv6 temporary - addresses, including completely disabling them for interfaces - where they are not needed. - - - - - Rspamd was updated to version 2.2. Read - - the upstream migration notes carefully. Please be - especially aware that some modules were removed and the - default Bayes backend is now Redis. - - - - - The *psu versions of oraclejdk8 have been - removed as they aren’t provided by upstream anymore. - - - - - The services.dnscrypt-proxy module has been - removed as it used the deprecated version of dnscrypt-proxy. - We’ve added - services.dnscrypt-proxy2.enable - to use the supported version. This module supports - configuration via the Nix attribute set - services.dnscrypt-proxy2.settings, - or by passing a TOML configuration file via - services.dnscrypt-proxy2.configFile. - - -{ - # Example configuration: - services.dnscrypt-proxy2.enable = true; - services.dnscrypt-proxy2.settings = { - listen_addresses = [ "127.0.0.1:43" ]; - sources.public-resolvers = { - urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ]; - cache_file = "public-resolvers.md"; - minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; - refresh_delay = 72; - }; - }; - - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; -} - - - - - qesteidutil has been deprecated in favor of - qdigidoc. - - - - - sqldeveloper_18 has been removed as it’s not maintained - anymore, sqldeveloper has been updated to version - 19.4. Please note that this means that this - means that the oraclejdk is now required. For further - information please read the - release - notes. - - - - - Haskell env and shellFor - dev shell environments now organize dependencies the same way - as regular builds. In particular, rather than receiving all - the different lists of dependencies mashed together as one big - list, and then partitioning into Haskell and non-Hakell - dependencies, they work from the original many different - dependency parameters and don’t need to algorithmically - partition anything. - - - This means that if you incorrectly categorize a dependency, - e.g. non-Haskell library dependency as a - buildDepends or run-time Haskell dependency - as a setupDepends, whereas things would - have worked before they may not work now. - - - - - The gcc-snapshot-package has been removed. It’s marked as - broken for >2 years and used to point to a fairly old - snapshot from the gcc7-branch. - - - - - The nixos-build-vms8 -script now uses the python test-driver. - - - - - The riot-web package now accepts configuration overrides as an - attribute set instead of a string. A formerly used JSON - configuration can be converted to an attribute set with - builtins.fromJSON. - - - The new default configuration also disables automatic guest - account registration and analytics to improve privacy. The - previous behavior can be restored by setting - config.riot-web.conf = { disable_guests = false; piwik = true; }. - - - - - Stand-alone usage of Upower now requires - services.upower.enable instead of just - installing into - environment.systemPackages. - - - - - nextcloud has been updated to v18.0.2. This - means that users from NixOS 19.09 can’t upgrade directly since - you can only move one version forward and 19.09 uses - v16.0.8. - - - To provide a safe upgrade-path and to circumvent similar - issues in the future, the following measures were taken: - - - - - The pkgs.nextcloud-attribute has been removed and replaced - with versioned attributes (currently pkgs.nextcloud17 and - pkgs.nextcloud18). With this change major-releases can be - backported without breaking stuff and to make - upgrade-paths easier. - - - - - Existing setups will be detected using - system.stateVersion: - by default, nextcloud17 will be used, but will raise a - warning which notes that after that deploy it’s - recommended to update to the latest stable version - (nextcloud18) by declaring the newly introduced setting - services.nextcloud.package. - - - - - Users with an overlay (e.g. to use nextcloud at version - v18 on 19.09) will - get an evaluation error by default. This is done to ensure - that our - package-option - doesn’t select an older version by accident. It’s - recommended to use pkgs.nextcloud18 or to set - package - to pkgs.nextcloud explicitly. - - - - - - Please note that if you’re coming from - 19.03 or older, you have to manually - upgrade to 19.09 first to upgrade your - server to Nextcloud v16. - - - - - - Hydra has gained a massive performance improvement due to - some - database schema changes by adding several IDs and - better indexing. However, it’s necessary to upgrade Hydra in - multiple steps: - - - - - At first, an older version of Hydra needs to be deployed - which adds those (nullable) columns. When having set - stateVersion - to a value older than 20.03, - this package will be selected by default from the module - when upgrading. Otherwise, the package can be deployed - using the following config: - - -{ pkgs, ... }: { - services.hydra.package = pkgs.hydra-migration; -} - - - - - - - Automatically fill the newly added ID columns on the server by - running the following command: - - -$ hydra-backfill-ids - - - - Please note that this process can take a while depending on - your database-size! - - - - - - Deploy a newer version of Hydra to activate the DB - optimizations. This can be done by using hydra-unstable. This - package already includes - flake-support - and is therefore compiled against pkgs.nixFlakes. - - - - If your - stateVersion - is set to 20.03 or greater, - hydra-unstable will be used automatically! This will break - your setup if you didn’t run the migration. - - - - Please note that Hydra is currently not available with - nixStable as this doesn’t compile anymore. - - - - pkgs.hydra has been removed to ensure a graceful - database-migration using the dedicated package-attributes. - If you still have pkgs.hydra defined in e.g. an overlay, an - assertion error will be thrown. To circumvent this, you need - to set - services.hydra.package - to pkgs.hydra explicitly and make sure you know what you’re - doing! - - - - - - The TokuDB storage engine will be disabled in mariadb 10.5. It - is recommended to switch to RocksDB. See also - TokuDB. - - - -
-
- Other Notable Changes - - - - SD images are now compressed by default using - bzip2. - - - - - The nginx web server previously started its master process as - root privileged, then ran worker processes as a less - privileged identity user (the nginx user). - This was changed to start all of nginx as a less privileged - user (defined by services.nginx.user and - services.nginx.group). As a consequence, - all files that are needed for nginx to run (included - configuration fragments, SSL certificates and keys, etc.) must - now be readable by this less privileged user/group. - - - To continue to use the old approach, you can configure: - - -{ - services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};''; - systemd.services.nginx.serviceConfig.User = lib.mkForce "root"; -} - - - - - OpenSSH has been upgraded from 7.9 to 8.1, improving security - and adding features but with potential incompatibilities. - Consult the - - release announcement for more information. - - - - - PRETTY_NAME in - /etc/os-release now uses the short rather - than full version string. - - - - - The ACME module has switched from simp-le to - lego - which allows us to support DNS-01 challenges and wildcard - certificates. The following options have been added: - security.acme.acceptTerms, - security.acme.certs.<name>.dnsProvider, - security.acme.certs.<name>.credentialsFile, - security.acme.certs.<name>.dnsPropagationCheck. - As well as this, the options - security.acme.acceptTerms and either - security.acme.email or - security.acme.certs.<name>.email must - be set in order to use the ACME module. Certificates will be - regenerated on activation, no account or certificate will be - migrated from simp-le. In particular private keys will not be - preserved. However, the credentials for simp-le are preserved - and thus it is possible to roll back to previous versions - without breaking certificate generation. Note also that in - contrary to simp-le a new private key is recreated at each - renewal by default, which can have consequences if you embed - your public key in apps. - - - - - It is now possible to unlock LUKS-Encrypted file systems using - a FIDO2 token via - boot.initrd.luks.fido2Support. - - - - - Predictably named network interfaces get renamed in stage-1. - This means that it is possible to use the proper interface - name for e.g. Dropbear setups. - - - For further reference, please read - #68953 - or the corresponding - discourse - thread. - - - - - The matrix-synapse-package has been updated to - v1.11.1. - Due to - stricter - requirements for database configuration when using - postgresql, the automated database setup of the module has - been removed to avoid any further edge-cases. - - - matrix-synapse expects postgresql-databases - to have the options LC_COLLATE and - LC_CTYPE set to - 'C' - which basically instructs postgresql to - ignore any locale-based preferences. - - - Depending on your setup, you need to incorporate one of the - following changes in your setup to upgrade to 20.03: - - - - - If you use sqlite3 you don’t need to do - anything. - - - - - If you use postgresql on a different - server, you don’t need to change anything as well since - this module was never designed to configure remote - databases. - - - - - If you use postgresql and configured - your synapse initially on 19.09 or - older, you simply need to enable postgresql-support - explicitly: - - -{ ... }: { - services.matrix-synapse = { - enable = true; - /* and all the other config you've defined here */ - }; - services.postgresql.enable = true; -} - - - - - - - If you deploy a fresh matrix-synapse, you need to configure - the database yourself (e.g. by using the - services.postgresql.initialScript - option). An example for this can be found in the - documentation of the - Matrix module. - - - - - If you initially deployed your matrix-synapse on - nixos-unstable after - the 19.09-release, your database is - misconfigured due to a regression in NixOS. For now, - matrix-synapse will startup with a warning, but it’s - recommended to reconfigure the database to set the values - LC_COLLATE and LC_CTYPE - to - 'C'. - - - - - The - systemd.network.links - option is now respected even when - systemd-networkd - is disabled. This mirrors the behaviour of systemd - It’s udev - that parses .link files, not - systemd-networkd. - - - - - mongodb has been updated to version 3.4.24. - - - - Please note that mongodb has been relicensed under their own - sspl-license. - Since it’s not entirely free and not OSI-approved, it’s - listed as non-free. This means that Hydra doesn’t provide - prebuilt mongodb-packages and needs to be built locally. - - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml deleted file mode 100644 index a1b007e711d7..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ /dev/null @@ -1,2210 +0,0 @@ -
- Release 20.09 (<quote>Nightingale</quote>, 2020.10/27) - - Support is planned until the end of June 2021, handing over to - 21.05. (Plans - - have shifted by two months since release of 20.09.) - -
- Highlights - - In addition to 7349 new, 14442 updated, and 8181 removed packages, - this release has the following highlights: - - - - - Core version changes: - - - - - gcc: 9.2.0 -> 9.3.0 - - - - - glibc: 2.30 -> 2.31 - - - - - linux: still defaults to 5.4.x, all supported kernels - available - - - - - mesa: 19.3.5 -> 20.1.7 - - - - - - - Desktop Environments: - - - - - plasma5: 5.17.5 -> 5.18.5 - - - - - kdeApplications: 19.12.3 -> 20.08.1 - - - - - gnome3: 3.34 -> 3.36, see its - release - notes - - - - - cinnamon: added at 4.6 - - - - - NixOS now distributes an official - GNOME - ISO - - - - - - - Programming Languages and Frameworks: - - - - - Agda ecosystem was heavily reworked (see more details - below) - - - - - PHP now defaults to PHP 7.4, updated from 7.3 - - - - - PHP 7.2 is no longer supported due to upstream not - supporting this version for the entire lifecycle of the - 20.09 release - - - - - Python 3 now defaults to Python 3.8 instead of 3.7 - - - - - Python 3.5 reached its upstream EOL at the end of - September 2020: it has been removed from the list of - available packages - - - - - - - Databases and Service Monitoring: - - - - - MariaDB has been updated to 10.4, MariaDB Galera to 26.4. - Please read the related upgrade instructions under - backwards - incompatibilities before upgrading. - - - - - Zabbix now defaults to 5.0, updated from 4.4. Please read - related sections under - backwards - compatibilities before upgrading. - - - - - - - Major module changes: - - - - - Quickly configure a complete, private, self-hosted video - conferencing solution with the new Jitsi Meet module. - - - - - Two new options, - authorizedKeysCommand - and - authorizedKeysCommandUser, - have been added to the openssh module. - If you have AuthorizedKeysCommand in - your - services.openssh.extraConfig - you should make use of these new options instead. - - - - - There is a new module for Podman - (virtualisation.podman), a drop-in - replacement for the Docker command line. - - - - - The new virtualisation.containers - module manages configuration shared by the CRI-O and - Podman modules. - - - - - Declarative Docker containers are renamed from - docker-containers to - virtualisation.oci-containers.containers. - This is to make it possible to use - podman instead of - docker. - - - - - The new option - documentation.man.generateCaches - has been added to automatically generate the - man-db caches, which are needed by - utilities like whatis and - apropos. The caches are generated - during the build of the NixOS configuration: since this - can be expensive when a large number of packages are - installed, the feature is disabled by default. - - - - - services.postfix.sslCACert was replaced - by - services.postfix.tlsTrustedAuthorities - which now defaults to system certificate authorities. - - - - - The various documented workarounds to use steam have been - converted to a module. - programs.steam.enable enables steam, - controller support and the workarounds. - - - - - Support for built-in LCDs in various pieces of Logitech - hardware (keyboards and USB speakers). - hardware.logitech.lcd.enable enables - support for all hardware supported by the - g15daemon - project. - - - - - The GRUB module gained support for basic password - protection, which allows to restrict non-default entries - in the boot menu to one or more users. The users and - passwords are defined via the option - boot.loader.grub.users. Note: Password - support is only available in GRUB version 2. - - - - - - - NixOS module changes: - - - - - The NixOS module system now supports freeform modules as a - mix between types.attrsOf and - types.submodule. These allow you to - explicitly declare a subset of options while still - permitting definitions without an associated option. See - for how to use - them. - - - - - Following its deprecation in 20.03, the Perl NixOS test - driver has been removed. All remaining tests have been - ported to the Python test framework. Code outside nixpkgs - using make-test.nix or - testing.nix needs to be ported to - make-test-python.nix and - testing-python.nix respectively. - - - - - Subordinate GID and UID mappings are now set up - automatically for all normal users. This will make - container tools like Podman work as non-root users out of - the box. - - - - - - - Starting with this release, the hydra-build-result - nixos-YY.MM branches no longer exist in the - deprecated - nixpkgs-channels repository. These branches are now in - the main - nixpkgs repository. - - - -
-
- New Services - - In addition to 1119 new, 118 updated, and 476 removed options; 61 - new modules were added since the last release: - - - - - Hardware: - - - - - hardware.system76.firmware-daemon.enable - adds easy support of system76 firmware - - - - - hardware.uinput.enable - loads uinput kernel module - - - - - hardware.video.hidpi.enable - enable good defaults for HiDPI displays - - - - - hardware.wooting.enable - support for Wooting keyboards - - - - - hardware.xpadneo.enable - xpadneo driver for Xbox One wireless controllers - - - - - - - Programs: - - - - - programs.hamster.enable - enable hamster time tracking - - - - - programs.steam.enable - adds easy enablement of steam and related system - configuration - - - - - - - Security: - - - - - security.doas.enable - alternative to sudo, allows non-root users to execute - commands as root - - - - - security.tpm2.enable - add Trusted Platform Module 2 support - - - - - - - System: - - - - - boot.initrd.network.openvpn.enable - start an OpenVPN client during initrd boot - - - - - - - Virtualization: - - - - - boot.enableContainers - use nixos-containers - - - - - virtualisation.oci-containers.containers - run OCI (Docker) containers - - - - - virtualisation.podman.enable - daemonless container engine - - - - - - - Services: - - - - - services.ankisyncd.enable - Anki sync server - - - - - services.bazarr.enable - Subtitle manager for Sonarr and Radarr - - - - - services.biboumi.enable - Biboumi XMPP gateway to IRC - - - - - services.blockbook-frontend - Blockbook-frontend, a service for the Trezor wallet - - - - - services.cage.enable - Wayland cage service - - - - - services.convos.enable - IRC daemon, which can be accessed throught the browser - - - - - services.engelsystem.enable - Tool for coordinating volunteers and shifts on large - events - - - - - services.espanso.enable - text-expander written in rust - - - - - services.foldingathome.enable - Folding@home client - - - - - services.gerrit.enable - Web-based team code collaboration tool - - - - - services.go-neb.enable - Matrix bot - - - - - services.hardware.xow.enable - xow as a systemd service - - - - - services.hercules-ci-agent.enable - Hercules CI build agent - - - - - services.jicofo.enable - Jitsi Conference Focus, component of Jitsi Meet - - - - - services.jirafeau.enable - A web file repository - - - - - services.jitsi-meet.enable - Secure, simple and scalable video conferences - - - - - services.jitsi-videobridge.enable - Jitsi Videobridge, a WebRTC compatible router - - - - - services.jupyterhub.enable - Jupyterhub development server - - - - - services.k3s.enable - Lightweight Kubernetes distribution - - - - - services.magic-wormhole-mailbox-server.enable - Magic Wormhole Mailbox Server - - - - - services.malcontent.enable - Parental Control support - - - - - services.matrix-appservice-discord.enable - Matrix and Discord bridge - - - - - services.mautrix-telegram.enable - Matrix-Telegram puppeting/relaybot bridge - - - - - services.mirakurun.enable - Japanese DTV Tuner Server Service - - - - - services.molly-brown.enable - Molly-Brown Gemini server - - - - - services.mullvad-vpn.enable - Mullvad VPN daemon - - - - - services.ncdns.enable - Namecoin to DNS bridge - - - - - services.nextdns.enable - NextDNS to DoH Proxy service - - - - - services.nix-store-gcs-proxy - Google storage bucket to be used as a nix store - - - - - services.onedrive.enable - OneDrive sync service - - - - - services.pinnwand.enable - Pastebin-like service - - - - - services.pixiecore.enable - Manage network booting of machines - - - - - services.privacyidea.enable - Privacy authentication server - - - - - services.quorum.enable - Quorum blockchain daemon - - - - - services.robustirc-bridge.enable - RobustIRC bridge - - - - - services.rss-bridge.enable - Generate RSS and Atom feeds - - - - - services.rtorrent.enable - rTorrent service - - - - - services.smartdns.enable - SmartDNS DNS server - - - - - services.sogo.enable - SOGo groupware - - - - - services.teeworlds.enable - Teeworlds game server - - - - - services.torque.mom.enable - torque computing node - - - - - services.torque.server.enable - torque server - - - - - services.tuptime.enable - A total uptime service - - - - - services.urserver.enable - X11 remote server - - - - - services.wasabibackend.enable - Wasabi backend service - - - - - services.yubikey-agent.enable - Yubikey agent - - - - - services.zigbee2mqtt.enable - Zigbee to MQTT bridge - - - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - MariaDB has been updated to 10.4, MariaDB Galera to 26.4. - Before you upgrade, it would be best to take a backup of your - database. For MariaDB Galera Cluster, see - Upgrading - from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster - instead. Before doing the upgrade read - Incompatible - Changes Between 10.3 and 10.4. After the upgrade you - will need to run mysql_upgrade. MariaDB - 10.4 introduces a number of changes to the authentication - process, intended to make things easier and more intuitive. - See - Authentication - from MariaDB 10.4. unix_socket auth plugin does not use - a password, and uses the connecting user’s UID instead. When a - new MariaDB data directory is initialized, two MariaDB users - are created and can be used with new unix_socket auth plugin, - as well as traditional mysql_native_password plugin: - root@localhost and mysql@localhost. To actually use the - traditional mysql_native_password plugin method, one must run - the following: - - -{ -services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' - ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); -''; -} - - - When MariaDB data directory is just upgraded (not - initialized), the users are not created or modified. - - - - - MySQL server is now started with additional systemd - sandbox/hardening options for better security. The PrivateTmp, - ProtectHome, and ProtectSystem options may be problematic when - MySQL is attempting to read from or write to your filesystem - anywhere outside of its own state directory, for example when - calling - LOAD DATA INFILE or SELECT * INTO OUTFILE. - In this scenario a variant of the following may be required: - - allow MySQL to read from /home and /tmp directories when using - LOAD DATA INFILE - - -{ - systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; -} - - - - allow MySQL to write to custom folder - /var/data when using - SELECT * INTO OUTFILE, assuming the mysql - user has write access to /var/data - - -{ - systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; -} - - - The MySQL service no longer runs its - systemd service startup script as - root anymore. A dedicated non - root super user account is required for - operation. This means users with an existing MySQL or MariaDB - database server are required to run the following SQL - statements as a super admin user before upgrading: - - -CREATE USER IF NOT EXISTS 'mysql'@'localhost' identified with unix_socket; -GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; - - - If you use MySQL instead of MariaDB please replace - unix_socket with - auth_socket. If you have changed the value - of - services.mysql.user - from the default of mysql to a different - user please change 'mysql'@'localhost' to - the corresponding user instead. - - - - - Zabbix now defaults to 5.0, updated from 4.4. Please carefully - read through - the - upgrade guide and apply any changes required. Be sure - to take special note of the section on - enabling - extended range of numeric (float) values as you will - need to apply this database migration manually. - - - If you are using Zabbix Server with a MySQL or MariaDB - database you should note that using a character set of - utf8 and a collate of - utf8_bin has become mandatory with this - release. See the upstream - issue - for further discussion. Before upgrading you should check the - character set and collation used by your database and ensure - they are correct: - - -SELECT - default_character_set_name, - default_collation_name -FROM - information_schema.schemata -WHERE - schema_name = 'zabbix'; - - - If these values are not correct you should take a backup of - your database and convert the character set and collation as - required. Here is an - example - of how to do so, taken from the Zabbix forums: - - -ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- the following will produce a list of SQL commands you should subsequently execute -SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString -FROM information_schema.`COLUMNS` -WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci"; - - - - - maxx package removed along with - services.xserver.desktopManager.maxx - module. Please migrate to cdesktopenv and - services.xserver.desktopManager.cde module. - - - - - The - matrix-synapse - module no longer includes optional dependencies by default, - they have to be added through the - plugins - option. - - - - - buildGoModule now internally creates a - vendor directory in the source tree for downloaded modules - instead of using go’s - module - proxy protocol. This storage format is simpler and - therefore less likely to break with future versions of go. As - a result buildGoModule switched from - modSha256 to the - vendorSha256 attribute to pin fetched - version data. - - - - - Grafana is now built without support for phantomjs by default. - Phantomjs support has been - deprecated - in Grafana and the phantomjs project is - currently - unmaintained. It can still be enabled by providing - phantomJsSupport = true to the package - instantiation: - - -{ - services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { - phantomJsSupport = true; - }); -} - - - - - The - supybot - module now uses /var/lib/supybot as its - default - stateDir - path if stateVersion is 20.09 or higher. It - also enables a number of - systemd - sandboxing options which may possibly interfere with - some plugins. If this is the case you can disable the options - through attributes in - systemd.services.supybot.serviceConfig. - - - - - The security.duosec.skey option, which - stored a secret in the nix store, has been replaced by a new - security.duosec.secretKeyFile - option for better security. - - - security.duosec.ikey has been renamed to - security.duosec.integrationKey. - - - - - vmware has been removed from the - services.x11.videoDrivers defaults. For - VMWare guests set - virtualisation.vmware.guest.enable to - true which will include the appropriate - drivers. - - - - - The initrd SSH support now uses OpenSSH rather than Dropbear - to allow the use of Ed25519 keys and other OpenSSH-specific - functionality. Host keys must now be in the OpenSSH format, - and at least one pre-generated key must be specified. - - - If you used the - boot.initrd.network.ssh.host*Key options, - you’ll get an error explaining how to convert your host keys - and migrate to the new - boot.initrd.network.ssh.hostKeys option. - Otherwise, if you don’t have any host keys set, you’ll need to - generate some; see the hostKeys option - documentation for instructions. - - - - - Since this release there’s an easy way to customize your PHP - install to get a much smaller base PHP with only wanted - extensions enabled. See the following snippet installing a - smaller PHP with the extensions imagick, - opcache, pdo and - pdo_mysql loaded: - - -{ - environment.systemPackages = [ - (pkgs.php.withExtensions - ({ all, ... }: with all; [ - imagick - opcache - pdo - pdo_mysql - ]) - ) - ]; -} - - - The default php attribute hasn’t lost any - extensions. The opcache extension has been - added. All upstream PHP extensions are available under - php.extensions.<name?>. - - - All PHP config flags have been removed for - the following reasons: - - - - - The updated php attribute is now easily - customizable to your liking by using - php.withExtensions or - php.buildEnv instead of writing config - files or changing configure flags. - - - - - The remaining configuration flags can now be set directly on - the php attribute. For example, instead of - - -{ - php.override { - config.php.embed = true; - config.php.apxs2 = false; - } -} - - - you should now write - - -{ - php.override { - embedSupport = true; - apxs2Support = false; - } -} - - - - - The ACME module has been overhauled for simplicity and - maintainability. Cert generation now implicitly uses the - acme user, and the - security.acme.certs._name_.user option has - been removed. Instead, certificate access from other services - is now managed through group permissions. The module no longer - runs lego twice under certain conditions, and will correctly - renew certificates if their configuration is changed. Services - which reload nginx and httpd after certificate renewal are now - properly configured too so you no longer have to do this - manually if you are using HTTPS enabled virtual hosts. A - mechanism for regenerating certs on demand has also been added - and documented. - - - - - Gollum received a major update to version 5.x and you may have - to change some links in your wiki when migrating from gollum - 4.x. More information can be found - here. - - - - - Deluge 2.x was added and is used as default for new NixOS - installations where stateVersion is >= 20.09. If you are - upgrading from a previous NixOS version, you can set - service.deluge.package = pkgs.deluge-2_x to - upgrade to Deluge 2.x and migrate the state to the new format. - Be aware that backwards state migrations are not supported by - Deluge. - - - - - Nginx web server now starting with additional - sandbox/hardening options. By default, write access to - /var/log/nginx and - /var/cache/nginx is allowed. To allow - writing to other folders, use - systemd.services.nginx.serviceConfig.ReadWritePaths - - -{ - systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; -} - - - Nginx is also started with the systemd option - ProtectHome = mkDefault true; which forbids - it to read anything from /home, - /root and /run/user (see - ProtectHome - docs for details). If you require serving files from - home directories, you may choose to set e.g. - - -{ - systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; -} - - - - - The NixOS options nesting.clone and - nesting.children have been deleted, and - replaced with named - specialisation - configurations. - - - Replace a nesting.clone entry with: - - -{ - specialisation.example-sub-configuration = { - configuration = { - ... - }; -}; - - - Replace a nesting.children entry with: - - -{ - specialisation.example-sub-configuration = { - inheritParentConfig = false; - configuration = { - ... - }; -}; - - - To switch to a specialised configuration at runtime you need - to run: - - -$ sudo /run/current-system/specialisation/example-sub-configuration/bin/switch-to-configuration test - - - Before you would have used: - - -$ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test - - - - - The Nginx log directory has been moved to - /var/log/nginx, the cache directory to - /var/cache/nginx. The option - services.nginx.stateDir has been removed. - - - - - The httpd web server previously started its main process as - root privileged, then ran worker processes as a less - privileged identity user. This was changed to start all of - httpd as a less privileged user (defined by - services.httpd.user - and - services.httpd.group). - As a consequence, all files that are needed for httpd to run - (included configuration fragments, SSL certificates and keys, - etc.) must now be readable by this less privileged user/group. - - - The default value for - services.httpd.mpm - has been changed from prefork to - event. Along with this change the default - value for - services.httpd.virtualHosts.<name>.http2 - has been set to true. - - - - - The systemd-networkd option - systemd.network.networks.<name>.dhcp.CriticalConnection - has been removed following upstream systemd’s deprecation of - the same. It is recommended to use - systemd.network.networks.<name>.networkConfig.KeepConfiguration - instead. See systemd.network 5 for details. - - - - - The systemd-networkd option - systemd.network.networks._name_.dhcpConfig - has been renamed to - systemd.network.networks.name.dhcpV4Config - following upstream systemd’s documentation change. See - systemd.network 5 for details. - - - - - In the picom module, several options that - accepted floating point numbers encoded as strings (for - example - services.picom.activeOpacity) - have been changed to the (relatively) new native - float type. To migrate your configuration - simply remove the quotes around the numbers. - - - - - When using buildBazelPackage from Nixpkgs, - flat hash mode is now used for dependencies - instead of recursive. This is to better - allow using hashed mirrors where needed. As a result, these - hashes will have changed. - - - - - The syntax of the PostgreSQL configuration file is now checked - at build time. If your configuration includes a file - inaccessible inside the build sandbox, set - services.postgresql.checkConfig to - false. - - - - - The rkt module has been removed, it was archived by upstream. - - - - - The - Bazaar - VCS is unmaintained and, as consequence of the Python 2 EOL, - the packages bazaar and - bazaarTools were removed. Breezy, the - backward compatible fork of Bazaar (see the - announcement), - was packaged as breezy and can be used - instead. - - - Regarding Nixpkgs, fetchbzr, - nix-prefetch-bzr and Bazaar support in - Hydra will continue to work through Breezy. - - - - - In addition to the hostname, the fully qualified domain name - (FQDN), which consists of - ${networking.hostName} and - ${networking.domain} is now added to - /etc/hosts, to allow local FQDN resolution, - as used by the hostname --fqdn command and - other applications that try to determine the FQDN. These new - entries take precedence over entries from the DNS which could - cause regressions in some very specific setups. Additionally - the hostname is now resolved to 127.0.0.2 - instead of 127.0.1.1 to be consistent with - what nss-myhostname (from systemd) returns. - The old behaviour can e.g. be restored by using - networking.hosts = lib.mkForce { "127.0.1.1" = [ config.networking.hostName ]; };. - - - - - The hostname (networking.hostName) must now - be a valid DNS label (see RFC 1035, RFC 1123) and as such must - not contain the domain part. This means that the hostname must - start with a letter or digit, end with a letter or digit, and - have as interior characters only letters, digits, and hyphen. - The maximum length is 63 characters. Additionally it is - recommended to only use lower-case characters. If (e.g. for - legacy reasons) a FQDN is required as the Linux kernel network - node hostname (uname --nodename) the option - boot.kernel.sysctl."kernel.hostname" - can be used as a workaround (but be aware of the 64 character - limit). - - - - - The GRUB specific option - boot.loader.grub.extraInitrd has been - replaced with the generic option - boot.initrd.secrets. This option creates a - secondary initrd from the specified files, rather than using a - manually created initrd file. Due to an existing bug with - boot.loader.grub.extraInitrd, it is not - possible to directly boot an older generation that used that - option. It is still possible to rollback to that generation if - the required initrd file has not been deleted. - - - - - The - DNSChain - package and NixOS module have been removed from Nixpkgs as the - software is unmaintained and can’t be built. For more - information see issue - #89205. - - - - - In the resilio module, - services.resilio.httpListenAddr - has been changed to listen to [::1] instead - of 0.0.0.0. - - - - - sslh has been updated to version - 1.21. The ssl probe must - be renamed to tls in - services.sslh.appendConfig. - - - - - Users of OpenAFS - 1.6 must upgrade their services to OpenAFS 1.8! In this - release, the OpenAFS package version 1.6.24 is marked broken - but can be used during transition to OpenAFS 1.8.x. Use the - options - services.openafsClient.packages.module, - services.openafsClient.packages.programs - and services.openafsServer.package to - select a different OpenAFS package. OpenAFS 1.6 will be - removed in the next release. The package - openafs and the service options will then - silently point to the OpenAFS 1.8 release. - - - See also the OpenAFS - Administrator - Guide for instructions. Beware of the following when - updating servers: - - - - - The storage format of the server key has changed and the - key must be converted before running the new release. - - - - - When updating multiple database servers, turn off the - database servers from the highest IP down to the lowest - with resting periods in between. Start up in reverse - order. Do not concurrently run database servers working - with different OpenAFS releases! - - - - - Update servers first, then clients. - - - - - - - Radicale’s default package has changed from 2.x to 3.x. An - upgrade checklist can be found - here. - You can use the newer version in the NixOS service by setting - the package to - radicale3, which is done automatically if - stateVersion is 20.09 or higher. - - - - - udpt experienced a complete rewrite from - C++ to rust. The configuration format changed from ini to - toml. The new configuration documentation can be found at - the - official website and example configuration is packaged - in ${udpt}/share/udpt/udpt.toml. - - - - - We now have a unified - services.xserver.displayManager.autoLogin - option interface to be used for every display-manager in - NixOS. - - - - - The bitcoind module has changed to - multi-instance, using submodules. Therefore, it is now - mandatory to name each instance. To use this new - multi-instance config with an existing bitcoind data directory - and user, you have to adjust the original config, e.g.: - - -{ - services.bitcoind = { - enable = true; - extraConfig = "..."; - ... - }; -} - - - To something similar: - - -{ - services.bitcoind.mainnet = { - enable = true; - dataDir = "/var/lib/bitcoind"; - user = "bitcoin"; - extraConfig = "..."; - ... - }; -} - - - The key settings are: - - - - - dataDir - to continue using the same - data directory. - - - - - user - to continue using the same user - so that bitcoind maintains access to its files. - - - - - - - Graylog introduced a change in the LDAP server certificate - validation behaviour for version 3.3.3 which might break - existing setups. When updating Graylog from a version before - 3.3.3 make sure to check the Graylog - release - info for information on how to avoid the issue. - - - - - The dokuwiki module has changed to - multi-instance, using submodules. Therefore, it is now - mandatory to name each instance. Moreover, forcing SSL by - default has been dropped, so nginx.forceSSL - and nginx.enableACME are no longer set to - true. To continue using your service with - the original SSL settings, you have to adjust the original - config, e.g.: - - -{ - services.dokuwiki = { - enable = true; - ... - }; -} - - - To something similar: - - -{ - services.dokuwiki."mywiki" = { - enable = true; - nginx = { - forceSSL = true; - enableACME = true; - }; - ... - }; -} - - - The base package has also been upgraded to the 2020-07-29 - Hogfather release. Plugins might be - incompatible or require upgrading. - - - - - The - services.postgresql.dataDir - option is now set to - "/var/lib/postgresql/${cfg.package.psqlSchema}" - regardless of your - system.stateVersion. - Users with an existing postgresql install that have a - system.stateVersion - of 17.03 or below should double check what - the value of their - services.postgresql.dataDir - option is (/var/db/postgresql) and then - explicitly set this value to maintain compatibility: - - -{ - services.postgresql.dataDir = "/var/db/postgresql"; -} - - - The postgresql module now expects there to be a database super - user account called postgres regardless of - your - system.stateVersion. - Users with an existing postgresql install that have a - system.stateVersion - of 17.03 or below should run the following - SQL statements as a database super admin user before - upgrading: - - -CREATE ROLE postgres LOGIN SUPERUSER; - - - - - The USBGuard module now removes options and instead hardcodes - values for IPCAccessControlFiles, - ruleFiles, and - auditFilePath. Audit logs can be found in - the journal. - - - - - The NixOS module system now evaluates option definitions more - strictly, allowing it to detect a larger set of problems. As a - result, what previously evaluated may not do so anymore. See - the - PR that changed this for more info. - - - - - For NixOS configuration options, the type - loaOf, after its initial deprecation in - release 20.03, has been removed. In NixOS and Nixpkgs options - using this type have been converted to - attrsOf. For more information on this - change have look at these links: - issue - #1800, - PR - #63103. - - - - - config.systemd.services.${name}.path now - returns a list of paths instead of a colon-separated string. - - - - - Caddy module now uses Caddy v2 by default. Caddy v1 can still - be used by setting - services.caddy.package - to pkgs.caddy1. - - - New option - services.caddy.adapter - has been added. - - - - - The - jellyfin - module will use and stay on the Jellyfin version - 10.5.5 if stateVersion - is lower than 20.09. This is because - significant changes were made to the database schema, and it - is highly recommended to backup your instance before - upgrading. After making your backup, you can upgrade to the - latest version either by setting your - stateVersion to 20.09 or - higher, or set the - services.jellyfin.package to - pkgs.jellyfin. If you do not wish to - upgrade Jellyfin, but want to change your - stateVersion, you can set the value of - services.jellyfin.package to - pkgs.jellyfin_10_5. - - - - - The security.rngd service is now disabled - by default. This choice was made because there’s krngd in the - linux kernel space making it (for most usecases) functionally - redundent. - - - - - The hardware.nvidia.optimus_prime.enable - service has been renamed to - hardware.nvidia.prime.sync.enable and has - many new enhancements. Related nvidia prime settings may have - also changed. - - - - - The package nextcloud17 has been removed and nextcloud18 was - marked as insecure since both of them will - - will be EOL (end of life) within the lifetime of 20.09. - - - It’s necessary to upgrade to nextcloud19: - - - - - From nextcloud17, you have to upgrade to nextcloud18 first - as Nextcloud doesn’t allow going multiple major revisions - forward in a single upgrade. This is possible by setting - services.nextcloud.package - to nextcloud18. - - - - - From nextcloud18, it’s possible to directly upgrade to - nextcloud19 by setting - services.nextcloud.package - to nextcloud19. - - - - - - - The GNOME desktop manager no longer default installs - gnome3.epiphany. It was chosen to do this as it has a - usability breaking issue (see issue - #98819) - that makes it unsuitable to be a default app. - - - - Issue - #98819 - is now fixed and gnome3.epiphany is once again installed by - default. - - - - - - If you want to manage the configuration of wpa_supplicant - outside of NixOS you must ensure that none of - networking.wireless.networks, - networking.wireless.extraConfig - or - networking.wireless.userControlled.enable - is being used or true. Using any of those - options will cause wpa_supplicant to be started with a NixOS - generated configuration file instead of your own. - - - -
-
- Other Notable Changes - - - - SD images are now compressed by default using - zstd. The compression for ISO images has - also been changed to zstd, but ISO images - are still not compressed by default. - - - - - services.journald.rateLimitBurst was - updated from 1000 to - 10000 to follow the new upstream systemd - default. - - - - - The notmuch package moves its emacs-related binaries and emacs - lisp files to a separate output. They’re not part of the - default out output anymore - if you relied - on the notmuch-emacs-mua binary or the - emacs lisp files, access them via the - notmuch.emacs output. - - - - - Device tree overlay support was improved in - #79370 - and now uses - hardware.deviceTree.kernelPackage - instead of hardware.deviceTree.base. - hardware.deviceTree.overlays - configuration was extended to support .dts - files with symbols. Device trees can now be filtered by - setting - hardware.deviceTree.filter - option. - - - - - The default output of buildGoPackage is now - $out instead of $bin. - - - - - buildGoModule doCheck - now defaults to true. - - - - - Packages built using buildRustPackage now - use release mode for the - checkPhase by default. - - - Please note that Rust packages utilizing a custom - build/install procedure (e.g. by using a - Makefile) or test suites that rely on the - structure of the target/ directory may - break due to those assumptions. For further information, - please read the Rust section in the Nixpkgs manual. - - - - - The cc- and binutils-wrapper’s infix salt and - _BUILD_ and _TARGET_ - user infixes have been replaced with with a suffix - salt and suffixes and _FOR_BUILD - and _FOR_TARGET. This matches the autotools - convention for env vars which standard for these things, - making interfacing with other tools easier. - - - - - Additional Git documentation (HTML and text files) is now - available via the git-doc package. - - - - - Default algorithm for ZRAM swap was changed to - zstd. - - - - - The installer now enables sshd by default. This improves - installation on headless machines especially ARM - single-board-computer. To login through ssh, either a password - or an ssh key must be set for the root user or the nixos user. - - - - - The scripted networking system now uses - .link files in - /etc/systemd/network to configure mac - address and link MTU, instead of the sometimes buggy - network-link-* units, which have been - removed. Bringing the interface up has been moved to the - beginning of the network-addresses-* unit. - Note this doesn’t require systemd-networkd - - it’s udev that parses .link files. Extra - care needs to be taken in the presence of - legacy - udev rules to rename interfaces, as MAC Address and MTU - defined in these options can only match on the original link - name. In such cases, you most likely want to create a - 10-*.link file through - systemd.network.links - and set both name and MAC Address / MTU there. - - - - - Grafana received a major update to version 7.x. A plugin is - now needed for image rendering support, and plugins must now - be signed by default. More information can be found - in - the Grafana documentation. - - - - - The hardware.u2f module, which was - installing udev rules was removed, as udev gained native - support to handle FIDO security tokens. - - - - - The services.transmission module was - enhanced with the new options: - services.transmission.credentialsFile, - services.transmission.openFirewall, - and - services.transmission.performanceNetParameters. - - - transmission-daemon is now started with - additional systemd sandbox/hardening options for better - security. Please - report - any use case where this is not working well. In particular, - the RootDirectory option newly set forbids - uploading or downloading a torrent outside of the default - directory configured at - settings.download-dir. - If you really need Transmission to access other directories, - you must include those directories into the - BindPaths of the service: - - -{ - systemd.services.transmission.serviceConfig.BindPaths = [ "/path/to/alternative/download-dir" ]; -} - - - Also, connection to the RPC (Remote Procedure Call) of - transmission-daemon is now only available - on the local network interface by default. Use: - - -{ - services.transmission.settings.rpc-bind-address = "0.0.0.0"; -} - - - to get the previous behavior of listening on all network - interfaces. - - - - - With this release systemd-networkd (when - enabled through - networking.useNetworkd) - has it’s netlink socket created through a - systemd.socket unit. This gives us control - over socket buffer sizes and other parameters. For larger - setups where networkd has to create a lot of (virtual) devices - the default buffer size (currently 128MB) is not enough. - - - On a machine with >100 virtual interfaces (e.g., wireguard - tunnels, VLANs, …), that all have to be brought up during - system startup, the receive buffer size will spike for a brief - period. Eventually some of the message will be dropped since - there is not enough (permitted) buffer space available. - - - By having systemd-networkd start with a - netlink socket created by systemd we can - configure the ReceiveBufferSize= parameter - in the socket options (i.e. - systemd.sockets.systemd-networkd.socketOptions.ReceiveBufferSize) - without recompiling systemd-networkd. - - - Since the actual memory requirements depend on hardware, - timing, exact configurations etc. it isn’t currently possible - to infer a good default from within the NixOS module system. - Administrators are advised to monitor the logs of - systemd-networkd for - rtnl: kernel receive buffer overrun spam - and increase the memory limit as they see fit. - - - Note: Increasing the ReceiveBufferSize= - doesn’t allocate any memory. It just increases the upper bound - on the kernel side. The memory allocation depends on the - amount of messages that are queued on the kernel side of the - netlink socket. - - - - - Specifying - mailboxes - in the dovecot2 module as a list is deprecated and will break - eval in 21.05. Instead, an attribute-set should be specified - where the name should be the key of the - attribute. - - - This means that a configuration like this - - -{ - services.dovecot2.mailboxes = [ - { name = "Junk"; - auto = "create"; - } - ]; -} - - - should now look like this: - - -{ - services.dovecot2.mailboxes = { - Junk.auto = "create"; - }; -} - - - - - netbeans was upgraded to 12.0 and now defaults to OpenJDK 11. - This might cause problems if your projects depend on packages - that were removed in Java 11. - - - - - nextcloud has been updated to - v19. - - - If you have an existing installation, please make sure that - you’re on nextcloud18 before upgrading to nextcloud19 since - Nextcloud doesn’t support upgrades across multiple major - versions. - - - - - The nixos-run-vms script now deletes the - previous run machines states on test startup. You can use the - --keep-vm-state flag to match the previous - behaviour and keep the same VM state between different test - runs. - - - - - The - nix.buildMachines - option is now type-checked. There are no functional changes, - however this may require updating some configurations to use - correct types for all attributes. - - - - - The fontconfig module stopped generating - config and cache files for fontconfig 2.10.x, the - /etc/fonts/fonts.conf now belongs to the - latest fontconfig, just like on other Linux distributions, and - we will - no - longer be versioning the config directories. - - - Fontconfig 2.10.x was removed from Nixpkgs since it hasn’t - been used in any Nixpkgs package for years now. - - - - - Nginx module - nginxModules.fastcgi-cache-purge renamed to - official name nginxModules.cache-purge. - Nginx module nginxModules.ngx_aws_auth - renamed to official name - nginxModules.aws-auth. - - - - - The option defaultPackages was added. It - installs the packages perl, rsync and strace for now. They - were added unconditionally to - systemPackages before, but are not strictly - necessary for a minimal NixOS install. You can set it to an - empty list to have a more minimal system. Be aware that some - functionality might still have an impure dependency on those - packages, so things might break. - - - - - The undervolt option no longer needs to - apply its settings every 30s. If they still become undone, - open an issue and restore the previous behaviour using - undervolt.useTimer. - - - - - Agda has been heavily reworked. - - - - - agda.mkDerivation has been heavily - changed and is now located at agdaPackages.mkDerivation. - - - - - New top-level packages agda and - agda.withPackages have been added, the - second of which sets up agda with access to chosen - libraries. - - - - - All agda libraries now live under - agdaPackages. - - - - - Many broken libraries have been removed. - - - - - See the - new - documentation for more information. - - - - - The deepin package set has been removed - from nixpkgs. It was a work in progress to package the - Deepin - Desktop Environment (DDE), including libraries, tools - and applications, and it was still missing a service to launch - the desktop environment. It has shown to no longer be a - feasible goal due to reasons discussed in - issue - #94870. The package - netease-cloud-music has also been removed, - as it depends on libraries from deepin. - - - - - The opendkim module now uses systemd - sandboxing features to limit the exposure of the system - towards the opendkim service. - - - - - Kubernetes has been upgraded to 1.19.1, which also means that - the golang version to build it has been bumped to 1.15. This - may have consequences for your existing clusters and their - certificates. Please consider - - the release notes for Kubernetes 1.19 carefully before - upgrading. - - - - - For AMD GPUs, Vulkan can now be used by adding - amdvlk to - hardware.opengl.extraPackages. - - - - - Similarly, still for AMD GPUs, the ROCm OpenCL stack can now - be used by adding rocm-opencl-icd to - hardware.opengl.extraPackages. - - - -
-
- Contributions - - I, Jonathan Ringer, would like to thank the following individuals - for their work on nixpkgs. This release could not be done without - the hard work of the NixOS community. There were 31282 - contributions across 1313 contributors. - - - - - 2288 Mario Rodas - - - - - 1837 Frederik Rietdijk - - - - - 946 Jörg Thalheim - - - - - 925 Maximilian Bosch - - - - - 687 Jonathan Ringer - - - - - 651 Jan Tojnar - - - - - 622 Daniël de Kok - - - - - 605 WORLDofPEACE - - - - - 597 Florian Klink - - - - - 528 José Romildo Malaquias - - - - - 281 volth - - - - - 101 Robert Scott - - - - - 86 Tim Steinbach - - - - - 76 WORLDofPEACE - - - - - 49 Maximilian Bosch - - - - - 42 Thomas Tuegel - - - - - 37 Doron Behar - - - - - 36 Vladimír Čunát - - - - - 27 Jonathan Ringer - - - - - 27 Maciej Krüger - - - - - I, Jonathan Ringer, would also like to personally thank - @WORLDofPEACE for their help in mentoring me on the release - process. Special thanks also goes to Thomas Tuegel for helping - immensely with stabilizing Qt, KDE, and Plasma5; I would also like - to thank Robert Scott for his numerous fixes and pull request - reviews. - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml deleted file mode 100644 index 868c1709879d..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ /dev/null @@ -1,1568 +0,0 @@ -
- Release 21.05 (<quote>Okapi</quote>, 2021.05/31) - - Support is planned until the end of December 2021, handing over to - 21.11. - -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Core version changes: - - - - - gcc: 9.3.0 -> 10.3.0 - - - - - glibc: 2.30 -> 2.32 - - - - - default linux: 5.4 -> 5.10, all supported kernels - available - - - - - mesa: 20.1.7 -> 21.0.1 - - - - - - - Desktop Environments: - - - - - GNOME: 3.36 -> 40, see its - release - notes - - - - - Plasma5: 5.18.5 -> 5.21.3 - - - - - kdeApplications: 20.08.1 -> 20.12.3 - - - - - cinnamon: 4.6 -> 4.8.1 - - - - - - - Programming Languages and Frameworks: - - - - - Python optimizations were disabled again. Builds with - optimizations enabled are not reproducible. Optimizations - can now be enabled with an option. - - - - - - - The linux_latest kernel was updated to the 5.13 series. It - currently is not officially supported for use with the zfs - filesystem. If you use zfs, you should use a different kernel - version (either the LTS kernel, or track a specific one). - - - -
-
- New Services - - The following new services were added since the last release: - - - - - GNURadio - 3.8 and 3.9 were - finally - packaged, along with a rewrite to the Nix expressions, - allowing users to override the features upstream supports - selecting to compile or not to. Additionally, the attribute - gnuradio (3.9), - gnuradio3_8 and - gnuradio3_7 now point to an externally - wrapped by default derivations, that allow you to also add - `extraPythonPackages` to the Python interpreter used by - GNURadio. Missing environmental variables needed for - operational GUI were also added - (#75478). - - - - - Keycloak, - an open source identity and access management server with - support for - OpenID - Connect, OAUTH - 2.0 and - SAML - 2.0. - - - See the Keycloak - section of the NixOS manual for more information. - - - - - services.samba-wsdd.enable - Web Services Dynamic Discovery host daemon - - - - - Discourse, - a modern and open source discussion platform. - - - See the Discourse - section of the NixOS manual for more information. - - - - - services.nebula.networks - Nebula - VPN - - - -
-
- Backward Incompatibilities - - When upgrading from a previous release, please be aware of the - following incompatible changes: - - - - - GNOME desktop environment was upgraded to 40, see the release - notes for - 40.0 - and - 3.38. - The gnome3 attribute set has been renamed - to gnome and so have been the NixOS - options. - - - - - If you are using services.udev.extraRules - to assign custom names to network interfaces, this may stop - working due to a change in the initialisation of dhcpcd and - systemd networkd. To avoid this, either move them to - services.udev.initrdRules or see the new - Assigning custom - names section of the NixOS manual for an example using - networkd links. - - - - - The security.hideProcessInformation module - has been removed. It was broken since the switch to - cgroups-v2. - - - - - The linuxPackages.ati_drivers_x11 kernel - modules have been removed. The drivers only supported kernels - prior to 4.2, and thus have become obsolete. - - - - - The systemConfig kernel parameter is no - longer added to boot loader entries. It has been unused since - September 2010, but if do have a system generation from that - era, you will now be unable to boot into them. - - - - - systemd-journal2gelf no longer parses json - and expects the receiving system to handle it. How to achieve - this with Graylog is described in this - GitHub - issue. - - - - - If the services.dbus module is enabled, - then the user D-Bus session is now always socket activated. - The associated options - services.dbus.socketActivated and - services.xserver.startDbusSession have - therefore been removed and you will receive a warning if they - are present in your configuration. This change makes the user - D-Bus session available also for non-graphical logins. - - - - - The networking.wireless.iwd module now - installs the upstream-provided 80-iwd.link file, which sets - the NamePolicy= for all wlan devices to keep - kernel, to avoid race conditions between iwd and - networkd. If you don’t want this, you can set - systemd.network.links."80-iwd" = lib.mkForce {}. - - - - - rubyMinimal was removed due to being unused - and unusable. The default ruby interpreter includes JIT - support, which makes it reference it’s compiler. Since JIT - support is probably needed by some Gems, it was decided to - enable this feature with all cc references by default, and - allow to build a Ruby derivation without references to cc, by - setting jitSupport = false; in an overlay. - See - #90151 - for more info. - - - - - Setting - services.openssh.authorizedKeysFiles now - also affects which keys - security.pam.enableSSHAgentAuth will use. - WARNING: If you are using these options in combination do make - sure that any key paths you use are present in - services.openssh.authorizedKeysFiles! - - - - - The option fonts.enableFontDir has been - renamed to - fonts.fontDir.enable. - The path of font directory has also been changed to - /run/current-system/sw/share/X11/fonts, for - consistency with other X11 resources. - - - - - A number of options have been renamed in the kicad interface. - oceSupport has been renamed to - withOCE, withOCCT has - been renamed to withOCC, - ngspiceSupport has been renamed to - withNgspice, and - scriptingSupport has been renamed to - withScripting. Additionally, - kicad/base.nix no longer provides default - argument values since these are provided by - kicad/default.nix. - - - - - The socket for the pdns-recursor module was - moved from /var/lib/pdns-recursor to - /run/pdns-recursor to match upstream. - - - - - Paperwork was updated to version 2. The on-disk format - slightly changed, and it is not possible to downgrade from - Paperwork 2 back to Paperwork 1.3. Back your documents up - before upgrading. See - this - thread for more details. - - - - - PowerDNS has been updated from 4.2.x to - 4.3.x. Please be sure to review the - Upgrade - Notes provided by upstream before upgrading. Worth - specifically noting is that the service now runs entirely as a - dedicated pdns user, instead of starting as - root and dropping privileges, as well as - the default socket-dir location changing - from /var/lib/powerdns to - /run/pdns. - - - - - The mediatomb service is now using by - default the new and maintained fork gerbera - package instead of the unmaintained - mediatomb package. If you want to keep the - old behavior, you must declare it with: - - -{ - services.mediatomb.package = pkgs.mediatomb; -} - - - One new option openFirewall has been - introduced which defaults to false. If you relied on the - service declaration to add the firewall rules itself before, - you should now declare it with: - - -{ - services.mediatomb.openFirewall = true; -} - - - - - xfsprogs was update from 4.19 to 5.11. It now enables reflink - support by default on filesystem creation. Support for - reflinks was added with an experimental status to kernel 4.9 - and deemed stable in kernel 4.16. If you want to be able to - mount XFS filesystems created with this release of xfsprogs on - kernel releases older than those, you need to format them with - mkfs.xfs -m reflink=0. - - - - - The uWSGI server is now built with POSIX capabilities. As a - consequence, root is no longer required in emperor mode and - the service defaults to running as the unprivileged - uwsgi user. Any additional capability can - be added via the new option - services.uwsgi.capabilities. - The previous behaviour can be restored by setting: - - -{ - services.uwsgi.user = "root"; - services.uwsgi.group = "root"; - services.uwsgi.instance = - { - uid = "uwsgi"; - gid = "uwsgi"; - }; -} - - - Another incompatibility from the previous release is that - vassals running under a different user or group need to use - immediate-{uid,gid} instead of the usual - uid,gid options. - - - - - btc1 has been abandoned upstream, and removed. - - - - - cpp_ethereum (aleth) has been abandoned upstream, and removed. - - - - - riak-cs package removed along with - services.riak-cs module. - - - - - stanchion package removed along with - services.stanchion module. - - - - - mutt has been updated to a new major version (2.x), which - comes with some backward incompatible changes that are - described in the - release - notes for Mutt 2.0. - - - - - vim and neovim switched - to Python 3, dropping all Python 2 support. - - - - - networking.wireguard.interfaces.<name>.generatePrivateKeyFile, - which is off by default, had a chmod race - condition fixed. As an aside, the parent directory’s - permissions were widened, and the key files were made - owner-writable. This only affects newly created keys. However, - if the exact permissions are important for your setup, read - #121294. - - - - - boot.zfs.forceImportAll - previously did nothing, but has been fixed. However its - default has been changed to false to - preserve the existing default behaviour. If you have this - explicitly set to true, please note that - your non-root pools will now be forcibly imported. - - - - - openafs now points to openafs_1_8, which is the new stable - release. OpenAFS 1.6 was removed. - - - - - The WireGuard module gained a new option - networking.wireguard.interfaces.<name>.peers.*.dynamicEndpointRefreshSeconds - that implements refreshing the IP of DNS-based endpoints - periodically (which WireGuard itself - cannot - do). - - - - - MariaDB has been updated to 10.5. Before you upgrade, it would - be best to take a backup of your database and read - - Incompatible Changes Between 10.4 and 10.5. After the - upgrade you will need to run mysql_upgrade. - - - - - The TokuDB storage engine dropped in mariadb 10.5 and removed - in mariadb 10.6. It is recommended to switch to RocksDB. See - also - TokuDB - and - MDEV-19780: - Remove the TokuDB storage engine. - - - - - The openldap module now has support for - OLC-style configuration, users of the - configDir option may wish to migrate. If - you continue to use configDir, ensure that - olcPidFile is set to - /run/slapd/slapd.pid. - - - As a result, extraConfig and - extraDatabaseConfig are removed. To help - with migration, you can convert your - slapd.conf file to OLC configuration with - the following script (find the location of this configuration - file by running systemctl status openldap, - it is the -f option. - - -$ TMPDIR=$(mktemp -d) -$ slaptest -f /path/to/slapd.conf -F $TMPDIR -$ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' - - - This will dump your current configuration in LDIF format, - which should be straightforward to convert into Nix settings. - This does not show your schema configuration, as this is - unnecessarily verbose for users of the default schemas and - slaptest is buggy with schemas directly in - the config file. - - - - - Amazon EC2 and OpenStack Compute (nova) images now re-fetch - instance meta data and user data from the instance metadata - service (IMDS) on each boot. For example: stopping an EC2 - instance, changing its user data, and restarting the instance - will now cause it to fetch and apply the new user data. - - - - Specifically, /etc/ec2-metadata is - re-populated on each boot. Some NixOS scripts that read from - this directory are guarded to only run if the files they - want to manipulate do not already exist, and so will not - re-apply their changes if the IMDS response changes. - Examples: root’s SSH key is only added if - /root/.ssh/authorized_keys does not - exist, and SSH host keys are only set from user data if they - do not exist in /etc/ssh. - - - - - - The rspamd services is now sandboxed. It is - run as a dynamic user instead of root, so secrets and other - files may have to be moved or their permissions may have to be - fixed. The sockets are now located in - /run/rspamd instead of - /run. - - - - - Enabling the Tor client no longer silently also enables and - configures Privoxy, and the - services.tor.client.privoxy.enable option - has been removed. To enable Privoxy, and to configure it to - use Tor’s faster port, use the following configuration: - - -{ - opt-services.privoxy.enable = true; - opt-services.privoxy.enableTor = true; -} - - - - - The services.tor module has a new - exhaustively typed - services.tor.settings - option following RFC 0042; backward compatibility with old - options has been preserved when aliasing was possible. The - corresponding systemd service has been hardened, but there is - a chance that the service still requires more permissions, so - please report any related trouble on the bugtracker. Onion - services v3 are now supported in - services.tor.relay.onionServices. - A new - services.tor.openFirewall - option as been introduced for allowing connections on all the - TCP ports configured. - - - - - The options - services.slurm.dbdserver.storagePass and - services.slurm.dbdserver.configFile have - been removed. Use - services.slurm.dbdserver.storagePassFile - instead to provide the database password. Extra config options - can be given via the option - services.slurm.dbdserver.extraConfig. The - actual configuration file is created on the fly on startup of - the service. This avoids that the password gets exposed in the - nix store. - - - - - The wafHook hook does not wrap Python - anymore. Packages depending on wafHook need - to include any Python into their - nativeBuildInputs. - - - - - Starting with version 1.7.0, the project formerly named - CodiMD is now named - HedgeDoc. New installations will no longer - use the old name for users, state directories and such, this - needs to be considered when moving state to a more recent - NixOS installation. Based on - system.stateVersion, - existing installations will continue to work. - - - - - The fish-foreign-env package has been replaced with - fishPlugins.foreign-env, in which the fish functions have been - relocated to the vendor_functions.d - directory to be loaded automatically. - - - - - The prometheus json exporter is now managed by the prometheus - community. Together with additional features some backwards - incompatibilities were introduced. Most importantly the - exporter no longer accepts a fixed command-line parameter to - specify the URL of the endpoint serving JSON. It now expects - this URL to be passed as an URL parameter, when scraping the - exporter’s /probe endpoint. In the - prometheus scrape configuration the scrape target might look - like this: - - -http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/endpoint - - - Existing configuration for the exporter needs to be updated, - but can partially be re-used. Documentation is available in - the upstream repository and a small example for NixOS is - available in the corresponding NixOS test. - - - These changes also affect - services.prometheus.exporters.rspamd.enable, - which is just a preconfigured instance of the json exporter. - - - For more information, take a look at the - - official documentation of the json_exporter. - - - - - Androidenv was updated, removing the - includeDocs and - lldbVersions arguments. Docs only covered a - single version of the Android SDK, LLDB is now bundled with - the NDK, and both are no longer available to download from the - Android package repositories. Additionally, since the package - lists have been updated, some older versions of Android - packages may not be bundled. If you depend on older versions - of Android packages, we recommend overriding the repo. - - - Android packages are now loaded from a repo.json file created - by parsing Android repo XML files. The arguments - repoJson and repoXmls - have been added to allow overriding the built-in androidenv - repo.json with your own. Additionally, license files are now - written to allow compatibility with Gradle-based tools, and - the extraLicenses argument has been added - to accept more SDK licenses if your project requires it. See - the androidenv documentation for more details. - - - - - The attribute mpi is now consistently used - to provide a default, system-wide MPI implementation. The - default implementation is openmpi, which has been used before - by all derivations affects by this change. Note that all - packages that have used mpi ? null in the - input for optional MPI builds, have been changed to the - boolean input paramater useMpi to enable - building with MPI. Building all packages with - mpich instead of the default - openmpi can now be achived like this: - - -self: super: -{ - mpi = super.mpich; -} - - - - - The Searx module has been updated with the ability to - configure the service declaratively and uWSGI integration. The - option services.searx.configFile has been - renamed to - services.searx.settingsFile - for consistency with the new - services.searx.settings. - In addition, the searx uid and gid - reservations have been removed since they were not necessary: - the service is now running with a dynamically allocated uid. - - - - - The libinput module has been updated with the ability to - configure mouse and touchpad settings separately. The options - in services.xserver.libinput have been - renamed to - services.xserver.libinput.touchpad, while - there is a new - services.xserver.libinput.mouse for mouse - related configuration. - - - Since touchpad options no longer apply to all devices, you may - want to replicate your touchpad configuration in mouse - section. - - - - - ALSA OSS emulation - (sound.enableOSSEmulation) is now disabled - by default. - - - - - Thinkfan as been updated to 1.2.x, which - comes with a new YAML based configuration format. For this - reason, several NixOS options of the thinkfan module have been - changed to non-backward compatible types. In addition, a new - services.thinkfan.settings - option has been added. - - - Please read the - - thinkfan documentation before updating. - - - - - Adobe Flash Player support has been dropped from the tree. In - particular, the following packages no longer support it: - - - - - chromium - - - - - firefox - - - - - qt48 - - - - - qt5.qtwebkit - - - - - Additionally, packages flashplayer and hal-flash were removed - along with the services.flashpolicyd - module. - - - - - The security.rngd module has been removed. - It was disabled by default in 20.09 as it was functionally - redundant with krngd in the linux kernel. It is not necessary - for any device that the kernel recognises as an hardware RNG, - as it will automatically run the krngd task to periodically - collect random data from the device and mix it into the - kernel’s RNG. - - - The default SMTP port for GitLab has been changed to - 25 from its previous default of - 465. If you depended on this default, you - should now set the - services.gitlab.smtp.port - option. - - - - - The default version of ImageMagick has been updated from 6 to - 7. You can use imagemagick6, imagemagick6_light, and - imagemagick6Big if you need the older version. - - - - - services.xserver.videoDrivers - no longer uses the deprecated cirrus and - vesa device dependent X drivers by default. - It also enables both amdgpu and - nouveau drivers by default now. - - - - - The kindlegen package is gone, because it - is no longer supported or hosted by Amazon. Sadly, its - replacement, Kindle Previewer, has no Linux support. However, - there are other ways to generate MOBI files. See - the - discussion for more info. - - - - - The apacheKafka packages are now built with version-matched - JREs. Versions 2.6 and above, the ones that recommend it, use - jdk11, while versions below remain on jdk8. The NixOS service - has been adjusted to start the service using the same version - as the package, adjustable with the new - services.apache-kafka.jre - option. Furthermore, the default list of - services.apache-kafka.jvmOptions - have been removed. You should set your own according to the - upstream - documentation for your Kafka version. - - - - - The kodi package has been modified to allow concise addon - management. Consider the following configuration from previous - releases of NixOS to install kodi, including the - kodiPackages.inputstream-adaptive and kodiPackages.vfs-sftp - addons: - - -{ - environment.systemPackages = [ - pkgs.kodi - ]; - - nixpkgs.config.kodi = { - enableInputStreamAdaptive = true; - enableVFSSFTP = true; - }; -} - - - All Kodi config flags have been removed, - and as a result the above configuration should now be written - as: - - -{ - environment.systemPackages = [ - (pkgs.kodi.withPackages (p: with p; [ - inputstream-adaptive - vfs-sftp - ])) - ]; -} - - - - - environment.defaultPackages now includes - the nano package. If pkgs.nano is not added to the list, make - sure another editor is installed and the - EDITOR environment variable is set to it. - Environment variables can be set using - environment.variables. - - - - - services.minio.dataDir changed type to a - list of paths, required for specifiyng multiple data - directories for using with erasure coding. Currently, the - service doesn’t enforce nor checks the correct number of paths - to correspond to minio requirements. - - - - - All CUDA toolkit versions prior to CUDA 10 have been removed. - - - - - The kbdKeymaps package was removed since dvp and neo are now - included in kbd. If you want to use the Programmer Dvorak - Keyboard Layout, you have to use - dvorak-programmer in - console.keyMap now instead of - dvp. In - services.xserver.xkbVariant it’s still - dvp. - - - - - The babeld service is now being run as an unprivileged user. - To achieve that the module configures - skip-kernel-setup true and takes care of - setting forwarding and rp_filter sysctls by itself as well as - for each interface in - services.babeld.interfaces. - - - - - The services.zigbee2mqtt.config option has - been renamed to - services.zigbee2mqtt.settings and now - follows - RFC - 0042. - - - - - The yadm dotfile manager has been updated from 2.x to 3.x, which - has new (XDG) default locations for some data/state files. Most - yadm commands will fail and print a legacy path warning (which - describes how to upgrade/migrate your repository). If you have - scripts, daemons, scheduled jobs, shell profiles, etc. that invoke - yadm, expect them to fail or misbehave until you perform this - migration and prepare accordingly. - - - - - Instead of determining - services.radicale.package automatically - based on system.stateVersion, the latest - version is always used because old versions are not officially - supported. - - - Furthermore, Radicale’s systemd unit was hardened which might - break some deployments. In particular, a non-default - filesystem_folder has to be added to - systemd.services.radicale.serviceConfig.ReadWritePaths - if the deprecated services.radicale.config - is used. - - - - - In the security.acme module, use of - --reuse-key parameter for Lego has been - removed. It was introduced for HKPK, but this security feature - is now deprecated. It is a better security practice to rotate - key pairs instead of always keeping the same. If you need to - keep this parameter, you can add it back using - extraLegoRenewFlags as an option for the - appropriate certificate. - - - -
-
- Other Notable Changes - - - - stdenv.lib has been deprecated and will - break eval in 21.11. Please use pkgs.lib - instead. See - #108938 - for details. - - - - - GNURadio - has a pkgs attribute set, and there’s a - gnuradio.callPackage function that extends - pkgs with a - mkDerivation, and a - mkDerivationWith, like Qt5. Now all - gnuradio.pkgs are defined with - gnuradio.callPackage and some packages that - depend on gnuradio are defined with this as well. - - - - - Privoxy has - been updated to version 3.0.32 (See - announcement). - Compared to the previous release, Privoxy has gained support - for HTTPS inspection (still experimental), Brotli - decompression, several new filters and lots of bug fixes, - including security ones. In addition, the package is now built - with compression and external filters support, which were - previously disabled. - - - Regarding the NixOS module, new options for HTTPS inspection - have been added and - services.privoxy.extraConfig has been - replaced by the new - services.privoxy.settings - (See - RFC - 0042 for the motivation). - - - - - Kodi has been - updated to version 19.1 Matrix. See the - announcement - for further details. - - - - - The services.packagekit.backend option has - been removed as it only supported a single setting which would - always be the default. Instead new - RFC - 0042 compliant - services.packagekit.settings - and - services.packagekit.vendorSettings - options have been introduced. - - - - - Nginx has been - updated to stable version 1.20.0. Now nginx uses the zlib-ng - library by default. - - - - - KDE Gear (formerly KDE Applications) is upgraded to 21.04, see - its - release - notes for details. - - - The kdeApplications package set is now - kdeGear, in keeping with the new name. The - old name remains for compatibility, but it is deprecated. - - - - - Libreswan has - been updated to version 4.4. The package now includes example - configurations and manual pages by default. The NixOS module - has been changed to use the upstream systemd units and write - the configuration in the /etc/ipsec.d/ - directory. In addition, two new options have been added to - specify connection policies - (services.libreswan.policies) - and disable send/receive redirects - (services.libreswan.disableRedirects). - - - - - The Mailman NixOS module (services.mailman) - has a new option - services.mailman.enablePostfix, - defaulting to true, that controls integration with Postfix. - - - If this option is disabled, default MTA config becomes not set - and you should set the options in - services.mailman.settings.mta according to - the desired configuration as described in - Mailman - documentation. - - - - - The default-version of nextcloud is - nextcloud21. Please note that it’s not - possible to upgrade nextcloud across - multiple major versions! This means that it’s e.g. not - possible to upgrade from nextcloud18 to nextcloud20 in a - single deploy and most 20.09 users will - have to upgrade to nextcloud20 first. - - - The package can be manually upgraded by setting - services.nextcloud.package - to nextcloud21. - - - - - The setting - services.redis.bind - defaults to 127.0.0.1 now, making Redis - listen on the loopback interface only, and not all public - network interfaces. - - - - - NixOS now emits a deprecation warning if systemd’s - StartLimitInterval setting is used in a - serviceConfig section instead of in a - unitConfig; that setting is deprecated and - now undocumented for the service section by systemd upstream, - but still effective and somewhat buggy there, which can be - confusing. See - #45785 - for details. - - - All services should use - systemd.services.name.startLimitIntervalSec - or StartLimitIntervalSec in - systemd.services.name.unitConfig - instead. - - - - - The mediatomb service declares new options. - It also adapts existing options so the configuration - generation is now lazy. The existing option - customCfg (defaults to false), when - enabled, stops the service configuration generation - completely. It then expects the users to provide their own - correct configuration at the right location (whereas the - configuration was generated and not used at all before). The - new option transcodingOption (defaults to - no) allows a generated configuration. It makes the mediatomb - service pulls the necessary runtime dependencies in the nix - store (whereas it was generated with hardcoded values before). - The new option mediaDirectories allows the - users to declare autoscan media directories from their nixos - configuration: - - -{ - services.mediatomb.mediaDirectories = [ - { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } - { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; } - ]; -} - - - - - The Unbound DNS resolver service - (services.unbound) has been refactored to - allow reloading, control sockets and to fix startup ordering - issues. - - - It is now possible to enable a local UNIX control socket for - unbound by setting the - services.unbound.localControlSocketPath - option. - - - Previously we just applied a very minimal set of restrictions - and trusted unbound to properly drop root privs and - capabilities. - - - As of this we are (for the most part) just using the upstream - example unit file for unbound. The main difference is that we - start unbound as unbound user with the - required capabilities instead of letting unbound do the chroot - & uid/gid changes. - - - The upstream unit configuration this is based on is a lot - stricter with all kinds of permissions then our previous - variant. It also came with the default of having the - Type set to notify, - therefore we are now also using the - unbound-with-systemd package here. Unbound - will start up, read the configuration files and start - listening on the configured ports before systemd will declare - the unit active (running). This will likely - help with startup order and the occasional race condition - during system activation where the DNS service is started but - not yet ready to answer queries. Services depending on - nss-lookup.target or - unbound.service are now be able to use - unbound when those targets have been reached. - - - Additionally to the much stricter runtime environment the - /dev/urandom mount lines we previously had - in the code (that randomly failed during the stop-phase) have - been removed as systemd will take care of those for us. - - - The preStart script is now only required if - we enabled the trust anchor updates (which are still enabled - by default). - - - Another benefit of the refactoring is that we can now issue - reloads via either pkill -HUP unbound and - systemctl reload unbound to reload the - running configuration without taking the daemon offline. A - prerequisite of this was that unbound configuration is - available on a well known path on the file system. We are - using the path /etc/unbound/unbound.conf as - that is the default in the CLI tooling which in turn enables - us to use unbound-control without passing a - custom configuration location. - - - The module has also been reworked to be - RFC - 0042 compliant. As such, - sevices.unbound.extraConfig has been - removed and replaced by - services.unbound.settings. - services.unbound.interfaces has been - renamed to - services.unbound.settings.server.interface. - - - services.unbound.forwardAddresses and - services.unbound.allowedAccess have also - been changed to use the new settings interface. You can follow - the instructions when executing - nixos-rebuild to upgrade your configuration - to use the new interface. - - - - - The services.dnscrypt-proxy2 module now - takes the upstream’s example configuration and updates it with - the user’s settings. An option has been added to restore the - old behaviour if you prefer to declare the configuration from - scratch. - - - - - NixOS now defaults to the unified cgroup hierarchy - (cgroupsv2). See the - Fedora - Article for 31 for details on why this is desirable, - and how it impacts containers. - - - If you want to run containers with a runtime that does not yet - support cgroupsv2, you can switch back to the old behaviour by - setting - systemd.enableUnifiedCgroupHierarchy - = false; and rebooting. - - - - - PulseAudio was upgraded to 14.0, with changes to the handling - of default sinks. See its - release - notes. - - - - - GNOME users may wish to delete their - ~/.config/pulse due to the changes to - stream routing logic. See - PulseAudio - bug 832 for more information. - - - - - The zookeeper package does not provide - zooInspector.sh anymore, as that - contrib has been dropped from upstream - releases. - - - - - In the ACME module, the data used to build the hash for the - account directory has changed to accommodate new features to - reduce account rate limit issues. This will trigger new - account creation on the first rebuild following this update. - No issues are expected to arise from this, thanks to the new - account creation handling. - - - - - users.users.name.createHome - now always ensures home directory permissions to be - 0700. Permissions had previously been - ignored for already existing home directories, possibly - leaving them readable by others. The option’s description was - incorrect regarding ownership management and has been - simplified greatly. - - - - - When defining a new user, one of - users.users.name.isNormalUser - and - users.users.name.isSystemUser - is now required. This is to prevent accidentally giving a UID - above 1000 to system users, which could have unexpected - consequences, like running user activation scripts for system - users. Note that users defined with an explicit UID below 500 - are exempted from this check, as - users.users.name.isSystemUser - has no effect for those. - - - - - The security.apparmor module, for the - AppArmor - Mandatory Access Control system, has been substantialy - improved along with related tools, so that module maintainers - can now more easily write AppArmor profiles for NixOS. The - most notable change on the user-side is the new option - security.apparmor.policies, - replacing the previous profiles option to - provide a way to disable a profile and to select whether to - confine in enforce mode (default) or in complain mode (see - journalctl -b --grep apparmor). - Security-minded users may also want to enable - security.apparmor.killUnconfinedConfinables, - at the cost of having some of their processes killed when - updating to a NixOS version introducing new AppArmor profiles. - - - - - The GNOME desktop manager once again installs gnome.epiphany - by default. - - - - - NixOS now generates empty /etc/netgroup. - /etc/netgroup defines network-wide groups - and may affect to setups using NIS. - - - - - Platforms, like stdenv.hostPlatform, no - longer have a platform attribute. It has - been (mostly) flattened away: - - - - - platform.gcc is now - gcc - - - - - platform.kernel* is now - linux-kernel.* - - - - - Additionally, platform.kernelArch moved to - the top level as linuxArch to match the - other *Arch variables. - - - The platform grouping of these things never - meant anything, and was just a historial/implementation - artifact that was overdue removal. - - - - - services.restic now uses a dedicated cache - directory for every backup defined in - services.restic.backups. The old global - cache directory, /root/.cache/restic, is - now unused and can be removed to free up disk space. - - - - - isync: The isync - compatibility wrapper was removed and the Master/Slave - terminology has been deprecated and should be replaced with - Far/Near in the configuration file. - - - - - The nix-gc service now accepts randomizedDelaySec (default: 0) - and persistent (default: true) parameters. By default nix-gc - will now run immediately if it would have been triggered at - least once during the time when the timer was inactive. - - - - - The rustPlatform.buildRustPackage function - is split into several hooks: cargoSetupHook to set up - vendoring for Cargo-based projects, cargoBuildHook to build a - project using Cargo, cargoInstallHook to install a project - using Cargo, and cargoCheckHook to run tests in Cargo-based - projects. With this change, mixed-language projects can use - the relevant hooks within builders other than - buildRustPackage. However, these changes - also required several API changes to - buildRustPackage itself: - - - - - The target argument was removed. - Instead, buildRustPackage will always - use the same target as the C/C++ compiler that is used. - - - - - The cargoParallelTestThreads argument - was removed. Parallel tests are now disabled through - dontUseCargoParallelTests. - - - - - - - The rustPlatform.maturinBuildHook hook was - added. This hook can be used with - buildPythonPackage to build Python packages - that are written in Rust and use Maturin as their build tool. - - - - - Kubernetes has - deprecated - docker as container runtime. As a consequence, the - Kubernetes module now has support for configuration of custom - remote container runtimes and enables containerd by default. - Note that containerd is more strict regarding container image - OCI-compliance. As an example, images with CMD or ENTRYPOINT - defined as strings (not lists) will fail on containerd, while - working fine on docker. Please test your setup and container - images with containerd prior to upgrading. - - - - - The GitLab module now has support for automatic backups. A - schedule can be set with the - services.gitlab.backup.startAt - option. - - - - - Prior to this release, systemd would also read system units - from an undocumented - /etc/systemd-mutable/system path. This path - has been dropped from the defaults. That path (or others) can - be re-enabled by adding it to the - boot.extraSystemdUnitPaths - list. - - - - - PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle - and has been removed. - - - - - Xfce4 relies - on GIO/GVfs for userspace virtual filesystem access in - applications like - thunar - and - gigolo. - For that to work, the gvfs nixos service is enabled by - default, and it can be configured with the specific package - that provides GVfs. Until now Xfce4 was setting it to use a - lighter version of GVfs (without support for samba). To avoid - conflicts with other desktop environments this setting has - been dropped. Users that still want it should add the - following to their system configuration: - - -{ - services.gvfs.package = pkgs.gvfs.override { samba = null; }; -} - - - - - The newly enabled systemd-pstore.service - now automatically evacuates crashdumps and panic logs from the - persistent storage to - /var/lib/systemd/pstore. This prevents - NVRAM from filling up, which ensures the latest diagnostic - data is always stored and alleviates problems with writing new - boot configurations. - - - - - Nixpkgs now contains - automatically - packaged GNOME Shell extensions from the - GNOME - Extensions portal. You can find them, filed by their - UUID, under gnome38Extensions attribute for - GNOME 3.38 and under gnome40Extensions for - GNOME 40. Finally, the gnomeExtensions - attribute contains extensions for the latest GNOME Shell - version in Nixpkgs, listed under a more human-friendly name. - The unqualified attribute scope also contains manually - packaged extensions. Note that the automatically packaged - extensions are provided for convenience and are not checked or - guaranteed to work. - - - - - Erlang/OTP versions older than R21 got dropped. We also - dropped the cuter package, as it was purely an example of how - to build a package. We also dropped lfe_1_2 - as it could not build with R21+. Moving forward, we expect to - only support 3 yearly releases of OTP. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml deleted file mode 100644 index 48a717916535..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ /dev/null @@ -1,2122 +0,0 @@ -
- Release 21.11 (“Porcupine”, 2021/11/30) - - - - Support is planned until the end of June 2022, handing over to - 22.05. - - - -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Nix has been updated to version 2.4, reference its - release - notes for more information on what has changed. The - previous version of Nix, 2.3.16, remains available for the - time being in the nix_2_3 package. - - - - - iptables is now using - nf_tables under the hood, by using - iptables-nft, similar to - Debian - and - Fedora. - This means, ip[6]tables, - arptables and ebtables - commands will actually show rules from some specific tables in - the nf_tables kernel subsystem. In case - you’re migrating from an older release without rebooting, - there might be cases where you end up with iptable rules - configured both in the legacy iptables - kernel backend, as well as in the nf_tables - backend. This can lead to confusing firewall behaviour. An - iptables-save after switching will complain - about iptables-legacy tables present. It’s - probably best to reboot after the upgrade, or manually - removing all legacy iptables rules (via the - iptables-legacy package). - - - - - systemd got an nftables backend, and - configures (networkd) rules in their own - io.systemd.* tables. Check - nft list ruleset to see these rules, not - iptables-save (which only shows - iptables-created rules. - - - - - PHP now defaults to PHP 8.0, updated from 7.4. - - - - - kops now defaults to 1.21.1, which uses containerd as the - default runtime. - - - - - python3 now defaults to Python 3.9, updated - from Python 3.8. - - - - - PostgreSQL now defaults to major version 13. - - - - - spark now defaults to spark 3, updated from 2. A - migration - guide is available. - - - - - Improvements have been made to the Hadoop module and package: - - - - - HDFS and YARN now support production-ready highly - available deployments with automatic failover. - - - - - Hadoop now defaults to Hadoop 3, updated from 2. - - - - - JournalNode, ZKFS and HTTPFS services have been added. - - - - - - - Activation scripts can now, optionally, be run during a - nixos-rebuild dry-activate and can detect - the dry activation by reading - $NIXOS_ACTION. This allows activation - scripts to output what they would change if the activation was - really run. The users/modules activation script supports this - and outputs some of is actions. - - - - - KDE Plasma now finally works on Wayland. - - - - - bash now defaults to major version 5. - - - - - Systemd was updated to version 249 (from 247). - - - - - Pantheon desktop has been updated to version 6. Due to changes - of screen locker, if locking doesn’t work for you, please try - gsettings set org.gnome.desktop.lockdown disable-lock-screen false. - - - - - kubernetes-helm now defaults to 3.7.0, - which introduced some breaking changes to the experimental OCI - manifest format. See - HIP - 6 for more details. helmfile also - defaults to 0.141.0, which is the minimum compatible version. - - - - - GNOME has been upgraded to 41. Please take a look at their - Release - Notes for details. - - - - - LXD support was greatly improved: - - - - - building LXD images from configurations is now directly - possible with just nixpkgs - - - - - hydra is now building nixOS LXD images that can be used - standalone with full nixos-rebuild support - - - - - - - OpenSSH was updated to version 8.8p1 - - - - - This breaks connections to old SSH daemons as ssh-rsa host - keys and ssh-rsa public keys that were signed with SHA-1 - are disabled by default now - - - - - These can be re-enabled, see the - OpenSSH - changelog for details - - - - - - - ORY Kratos was updated to version 0.8.0-alpha.3 - - - - - This release requires you to run SQL migrations. Please, - as always, create a backup of your database first! - - - - - The SDKs are now generated with tag v0alpha2 to reflect - that some signatures have changed in a breaking fashion. - Please update your imports from v0alpha1 to v0alpha2. - - - - - The SMTPS scheme used in courier config URL with - cleartext/StartTLS/TLS SMTP connection types is now only - supporting implicit TLS. For StartTLS and cleartext SMTP, - please use the SMTP scheme instead. - - - - - for more details, see - Release - Notes. - - - - - -
-
- New Services - - - - btrbk, - a backup tool for btrfs subvolumes, taking advantage of btrfs - specific capabilities to create atomic snapshots and transfer - them incrementally to your backup locations. Available as - services.btrbk. - - - - - clipcat, - an X11 clipboard manager written in Rust. Available at - services.clipcat. - - - - - dex, - an OpenID Connect (OIDC) identity and OAuth 2.0 provider. - Available at - services.dex. - - - - - geoipupdate, - a GeoIP database updater from MaxMind. Available as - services.geoipupdate. - - - - - Jibri, - a service for recording or streaming a Jitsi Meet conference. - Available as - services.jibri. - - - - - Kea, ISCs - 2nd generation DHCP and DDNS server suite. Available at - services.kea. - - - - - owncast, - self-hosted video live streaming solution. Available at - services.owncast. - - - - - PeerTube, - developed by Framasoft, is the free and decentralized - alternative to video platforms. Available at - services.peertube. - - - - - sourcehut, a - collection of tools useful for software development. Available - as - services.sourcehut. - - - - - ucarp, - an userspace implementation of the Common Address Redundancy - Protocol (CARP). Available as - networking.ucarp. - - - - - Users of flashrom should migrate to - programs.flashrom.enable - and add themselves to the flashrom group to - be able to access programmers supported by flashrom. - - - - - vikunja, a to-do - list app. Available as - services.vikunja. - - - - - opensnitch, - an application firewall. Available as - services.opensnitch. - - - - - snapraid, a - backup program for disk arrays. Available as - snapraid. - - - - - Hockeypuck, - a OpenPGP Key Server. Available as - services.hockeypuck. - - - - - buildkite-agent-metrics, - a command-line tool for collecting Buildkite agent metrics, - now has a Prometheus exporter available as - services.prometheus.exporters.buildkite-agent. - - - - - influxdb-exporter - a Prometheus exporter that exports metrics received on an - InfluxDB compatible endpoint is now available as - services.prometheus.exporters.influxdb. - - - - - mx-puppet-discord, - a discord puppeting bridge for matrix. Available as - services.mx-puppet-discord. - - - - - MeshCentral, - a remote administration service (TeamViewer but - self-hosted and with more features) is now available - with a package and a module: - services.meshcentral.enable - - - - - moonraker, - an API web server for Klipper. Available as - moonraker. - - - - - influxdb2, - a Scalable datastore for metrics, events, and real-time - analytics. Available as - services.influxdb2. - - - - - isso, a - commenting server similar to Disqus. Available as - isso - - - - - navidrome, - a personal music streaming server with subsonic-compatible - api. Available as - navidrome. - - - - - fluidd, a - Klipper web interface for managing 3d printers using - moonraker. Available as - fluidd. - - - - - sx, - a simple alternative to both xinit and startx for starting a - Xorg server. Available as - services.xserver.displayManager.sx - - - - - postfixadmin, - a web based virtual user administration interface for Postfix - mail servers. Available as - postfixadmin. - - - - - prowlarr, - an indexer manager/proxy built on the popular arr .net/reactjs - base stack - services.prowlarr. - - - - - soju, a - user-friendly IRC bouncer. Available as - services.soju. - - - - - nats, a high - performance cloud and edge messaging system. Available as - services.nats. - - - - - git, a - distributed version control system. Available as - programs.git. - - - - - parsedmarc, - a service which parses incoming - DMARC reports and - stores or sends them to a downstream service for further - analysis. Documented in - its manual - entry. - - - - - spark, a - unified analytics engine for large-scale data processing. - - - - - touchegg, - a multi-touch gesture recognizer. Available as - services.touchegg. - - - - - pantheon-tweaks, - an unofficial system settings panel for Pantheon. Available as - programs.pantheon-tweaks. - - - - - joycond, - a service that uses hid-nintendo to provide - nintendo joycond pairing and better nintendo switch pro - controller support. - - - - - multipath, - the device mapper multipath (DM-MP) daemon. Available as - services.multipath. - - - - - seafile, - an open source file syncing & sharing software. Available - as - services.seafile. - - - - - rasdaemon, - a hardware error logging daemon. Available as - hardware.rasdaemon. - - - - - code-server-module now available - - - - - xmrig, - a high performance, open source, cross platform RandomX, - KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and - RandomX benchmark. - - - - - Auto nice daemons - ananicy - and - ananicy-cpp. - Available as - services.ananicy. - - - - - smartctl_exporter, - a Prometheus exporter for - S.M.A.R.T. - data. Available as - services.prometheus.exporters.smartctl. - - - - - twingate, - a high performance, easy to use zero trust solution that - enables access to private resources from any device with - better security than a VPN. - - - -
-
- Backward Incompatibilities - - - - The NixOS VM test framework, - pkgs.nixosTest/make-test-python.nix - (pkgs.testers.nixosTest since 22.05), now - requires detaching commands such as - succeed("foo &") and - succeed("foo | xclip -i") to - close stdout. This can be done with a redirect such as - succeed("foo >&2 &"). - This breaking change was necessitated by a race condition - causing tests to fail or hang. It applies to all methods that - invoke commands on the nodes, including - execute, succeed, - fail, - wait_until_succeeds, - wait_until_fails. - - - - - The services.wakeonlan option was removed, - and replaced with - networking.interfaces.<name>.wakeOnLan. - - - - - The security.wrappers option now requires - to always specify an owner, group and whether the - setuid/setgid bit should be set. This is motivated by the fact - that before NixOS 21.11, specifying either setuid or setgid - but not owner/group resulted in wrappers owned by - nobody/nogroup, which is unsafe. - - - - - Since iptables now uses - nf_tables backend and - ipset doesn’t support it, some applications - (ferm, shorewall, firehol) may have limited functionality. - - - - - The paperless module and package have been - removed. All users should migrate to the successor - paperless-ng instead. The Paperless project - has - been archived and advises all users to use - paperless-ng instead. - - - Users can use the services.paperless-ng - module as a replacement while noting the following - incompatibilities: - - - - - services.paperless.ocrLanguages has no - replacement. Users should migrate to - services.paperless-ng.extraConfig - instead: - - - - -{ - services.paperless-ng.extraConfig = { - # Provide languages as ISO 639-2 codes - # separated by a plus (+) sign. - # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes - PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse - }; -} - - - - - If you previously specified - PAPERLESS_CONSUME_MAIL_* settings in - services.paperless.extraConfig you - should remove those options now. You now - must define those settings in the - admin interface of paperless-ng. - - - - - Option services.paperless.manage no - longer exists. Use the script at - ${services.paperless-ng.dataDir}/paperless-ng-manage - instead. Note that this script only exists after the - paperless-ng service has been started - at least once. - - - - - After switching to the new system configuration you should - run the Django management command to reindex your - documents and optionally create a user, if you don’t have - one already. - - - To do so, enter the data directory (the value of - services.paperless-ng.dataDir, - /var/lib/paperless by default), switch - to the paperless user and execute the management command - like below: - - -$ cd /var/lib/paperless -$ su paperless -s /bin/sh -$ ./paperless-ng-manage document_index reindex -# if not already done create a user account, paperless-ng requires a login -$ ./paperless-ng-manage createsuperuser -Username (leave blank to use 'paperless'): my-user-name -Email address: me@example.com -Password: ********** -Password (again): ********** -Superuser created successfully. - - - - - - - The staticjinja package has been upgraded - from 1.0.4 to 4.1.1 - - - - - Firefox v91 does not support addons with invalid signature - anymore. Firefox ESR needs to be used for nix addon support. - - - - - The erigon ethereum node has moved to a new - database format in 2021-05-04, and requires - a full resync - - - - - The erigon ethereum node has moved its - database location in 2021-08-03, users - upgrading must manually move their chaindata (see - release - notes). - - - - - users.users.<name>.group - no longer defaults to nogroup, which was - insecure. Out-of-tree modules are likely to require - adaptation: instead of - - -{ - users.users.foo = { - isSystemUser = true; - }; -} - - - also create a group for your user: - - -{ - users.users.foo = { - isSystemUser = true; - group = "foo"; - }; - users.groups.foo = {}; -} - - - - - services.geoip-updater was broken and has - been replaced by - services.geoipupdate. - - - - - ihatemoney has been updated to version - 5.1.1 - (release - notes). If you serve ihatemoney by HTTP rather than - HTTPS, you must set - services.ihatemoney.secureCookie - to false. - - - - - PHP 7.3 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 21.11 release. - - - - - Those making use of buildBazelPackage will - need to regenerate the fetch hashes (preferred), or set - fetchConfigured = false;. - - - - - consul was upgraded to a new major release - with breaking changes, see - upstream - changelog. - - - - - fsharp41 has been removed in preference to use the latest - dotnet-sdk - - - - - The following F#-related packages have been removed for being - unmaintaned. Please use fetchNuGet for - specific packages. - - - - - ExtCore - - - - - Fake - - - - - Fantomas - - - - - FsCheck - - - - - FsCheck262 - - - - - FsCheckNunit - - - - - FSharpAutoComplete - - - - - FSharpCompilerCodeDom - - - - - FSharpCompilerService - - - - - FSharpCompilerTools - - - - - FSharpCore302 - - - - - FSharpCore3125 - - - - - FSharpCore4001 - - - - - FSharpCore4117 - - - - - FSharpData - - - - - FSharpData225 - - - - - FSharpDataSQLProvider - - - - - FSharpFormatting - - - - - FsLexYacc - - - - - FsLexYacc706 - - - - - FsLexYaccRuntime - - - - - FsPickler - - - - - FsUnit - - - - - Projekt - - - - - Suave - - - - - UnionArgParser - - - - - ExcelDnaRegistration - - - - - MathNetNumerics - - - - - - - programs.x2goserver is now - services.x2goserver - - - - - The following dotnet-related packages have been removed for - being unmaintaned. Please use fetchNuGet - for specific packages. - - - - - Autofac - - - - - SystemValueTuple - - - - - MicrosoftDiaSymReader - - - - - MicrosoftDiaSymReaderPortablePdb - - - - - SystemCollectionsImmutable - - - - - SystemCollectionsImmutable131 - - - - - SystemReflectionMetadata - - - - - NUnit350 - - - - - Deedle - - - - - ExcelDna - - - - - GitVersionTree - - - - - NDeskOptions - - - - - - - - - The antlr package now defaults to the 4.x - release instead of the old 2.7.7 version. - - - - - The pulseeffects package updated to - version - 4.x and renamed to easyeffects. - - - - - The libwnck package now defaults to the 3.x - release instead of the old 2.31.0 version. - - - - - The bitwarden_rs packages and modules were - renamed to vaultwarden - following - upstream. More specifically, - - - - - pkgs.bitwarden_rs, - pkgs.bitwarden_rs-sqlite, - pkgs.bitwarden_rs-mysql and - pkgs.bitwarden_rs-postgresql were - renamed to pkgs.vaultwarden, - pkgs.vaultwarden-sqlite, - pkgs.vaultwarden-mysql and - pkgs.vaultwarden-postgresql, - respectively. - - - - - Old names are preserved as aliases for backwards - compatibility, but may be removed in the future. - - - - - The bitwarden_rs executable was - also renamed to vaultwarden in all - packages. - - - - - - - pkgs.bitwarden_rs-vault was renamed to - pkgs.vaultwarden-vault. - - - - - pkgs.bitwarden_rs-vault is - preserved as an alias for backwards compatibility, but - may be removed in the future. - - - - - The static files were moved from - /usr/share/bitwarden_rs to - /usr/share/vaultwarden. - - - - - - - The services.bitwarden_rs config module - was renamed to services.vaultwarden. - - - - - services.bitwarden_rs is preserved - as an alias for backwards compatibility, but may be - removed in the future. - - - - - - - systemd.services.bitwarden_rs, - systemd.services.backup-bitwarden_rs - and systemd.timers.backup-bitwarden_rs - were renamed to - systemd.services.vaultwarden, - systemd.services.backup-vaultwarden and - systemd.timers.backup-vaultwarden, - respectively. - - - - - Old names are preserved as aliases for backwards - compatibility, but may be removed in the future. - - - - - - - users.users.bitwarden_rs and - users.groups.bitwarden_rs were renamed - to users.users.vaultwarden and - users.groups.vaultwarden, respectively. - - - - - The data directory remains located at - /var/lib/bitwarden_rs, for backwards - compatibility. - - - - - - - - - yggdrasil was upgraded to a new major - release with breaking changes, see - upstream - changelog. - - - - - icingaweb2 was upgraded to a new release - which requires a manual database upgrade, see - upstream - changelog. - - - - - The isabelle package has been upgraded from - 2020 to 2021 - - - - - the mingw-64 package has been upgraded from - 6.0.0 to 9.0.0 - - - - - tt-rss was upgraded to the commit on - 2021-06-21, which has breaking changes. If you use - services.tt-rss.extraConfig you should - migrate to the putenv-style configuration. - See - this - Discourse post in the tt-rss forums for more details. - - - - - The following Visual Studio Code extensions were renamed to - keep the naming convention uniform. - - - - - bbenoist.Nix -> - bbenoist.nix - - - - - CoenraadS.bracket-pair-colorizer -> - coenraads.bracket-pair-colorizer - - - - - golang.Go -> - golang.go - - - - - - - services.uptimed now uses - /var/lib/uptimed as its stateDirectory - instead of /var/spool/uptimed. Make sure to - move all files to the new directory. - - - - - Deprecated package aliases in emacs.pkgs.* - have been removed. These aliases were remnants of the old - Emacs package infrastructure. We now use exact upstream names - wherever possible. - - - - - programs.neovim.runtime switched to a - linkFarm internally, making it impossible - to use wildcards in the source argument. - - - - - The openrazer and - openrazer-daemon packages as well as the - hardware.openrazer module now require users - to be members of the openrazer group - instead of plugdev. With this change, users - no longer need be granted the entire set of - plugdev group permissions, which can - include permissions other than those required by - openrazer. This is desirable from a - security point of view. The setting - harware.openrazer.users - can be used to add users to the openrazer - group. - - - - - The fontconfig service’s dpi option has been removed. - Fontconfig should use Xft settings by default so there’s no - need to override one value in multiple places. The user can - set DPI via ~/.Xresources properly, or at the system level per - monitor, or as a last resort at the system level with - services.xserver.dpi. - - - - - The yambar package has been split into - yambar and - yambar-wayland, corresponding to the xorg - and wayland backend respectively. Please switch to - yambar-wayland if you are on wayland. - - - - - The services.minio module gained an - additional option consoleAddress, that - configures the address and port the web UI is listening, it - defaults to :9001. To be able to access the - web UI this port needs to be opened in the firewall. - - - - - The varnish package was upgraded from 6.3.x - to 7.x. varnish60 for the last LTS release - is also still available. - - - - - The kubernetes package was upgraded to - 1.22. The kubernetes.apiserver.kubeletHttps - option was removed and HTTPS is always used. - - - - - The attribute linuxPackages_latest_hardened - was dropped because the hardened patches lag behind the - upstream kernel which made version bumps harder. If you want - to use a hardened kernel, please pin it explicitly with a - versioned attribute such as - linuxPackages_5_10_hardened. - - - - - The nomad package now defaults to a 1.1.x - release instead of 1.0.x - - - - - If exfat is included in - boot.supportedFilesystems and when using - kernel 5.7 or later, the exfatprogs - user-space utilities are used instead of - exfat. - - - - - The todoman package was upgraded from 3.9.0 - to 4.0.0. This introduces breaking changes in the - configuration - file format. - - - - - The datadog-agent, - datadog-integrations-core and - datadog-process-agent packages were - upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and - 6.11.1 to 7.30.2, respectively. As a result - services.datadog-agent has had breaking - changes to the configuration file. For details, see the - upstream - changelog. - - - - - opencv2 no longer includes the non-free - libraries by default, and consequently - pfstools no longer includes OpenCV support - by default. Both packages now support an - enableUnfree option to re-enable this - functionality. - - - - - services.xserver.displayManager.defaultSession = "plasma5" - does not work anymore, instead use either - "plasma" for the Plasma X11 - session or "plasmawayland" for - the Plasma Wayland sesison. - - - - - boot.kernelParams now only accepts one - command line parameter per string. This change is aimed to - reduce common mistakes like param = 12, which - would be parsed as 3 parameters. - - - - - nix.daemonNiceLevel and - nix.daemonIONiceLevel have been removed in - favour of the new options - nix.daemonCPUSchedPolicy, - nix.daemonIOSchedClass - and - nix.daemonIOSchedPriority. - Please refer to the options documentation and the - sched(7) and - ioprio_set(2) man pages for guidance on how - to use them. - - - - - The coursier package’s binary was renamed - from coursier to cs. - Completions which haven’t worked for a while should now work - with the renamed binary. To keep using - coursier, you can create a shell alias. - - - - - The services.mosquitto module has been - rewritten to support multiple listeners and per-listener - configuration. Module configurations from previous releases - will no longer work and must be updated. - - - - - The fluidsynth_1 attribute has been - removed, as this legacy version is no longer needed in - nixpkgs. The actively maintained 2.x series is available as - fluidsynth unchanged. - - - - - Nextcloud 20 (pkgs.nextcloud20) has been - dropped because it was EOLed by upstream in 2021-10. - - - - - The virtualisation.pathsInNixDB option was - renamed - virtualisation.additionalPaths. - - - - - The services.ddclient.password option was - removed, and replaced with - services.ddclient.passwordFile. - - - - - The default GNAT version has been changed: The - gnat attribute now points to - gnat12 instead of gnat9. - - - - - retroArchCores has been removed. This means - that using nixpkgs.config.retroarch to - customize RetroArch cores is not supported anymore. Instead, - use package overrides, for example: - retroarch.override { cores = with libretro; [ citra snes9x ]; };. - Also, retroarchFull derivation is available - for those who want to have all RetroArch cores available. - - - - - The Linux kernel for security reasons now restricts access to - BPF syscalls via BPF_UNPRIV_DEFAULT_OFF=y. - Unprivileged access can be reenabled via the - kernel.unprivileged_bpf_disabled sysctl - knob. - - - - - /usr will always be included in the initial - ramdisk. See the - fileSystems.<name>.neededForBoot - option. If any files exist under /usr - (which is not typical for NixOS), they will be included in the - initial ramdisk, increasing its size to a possibly problematic - extent. - - - - - pkgs.haskell-language-server will now by - default be linked dynamically to improve TemplateHaskell - compatibility. To mitigate the increased closure size it will - now by default only support our current default ghc (at the - moment 9.0.2). Add other ghc versions via e.g. - pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. - - - -
-
- Other Notable Changes - - - - The linux kernel package infrastructure was moved out of - all-packages.nix, and restructured. Linux - related functions and attributes now live under the - pkgs.linuxKernel attribute set. In - particular the versioned linuxPackages_* - package sets (such as linuxPackages_5_4) - and kernels from pkgs were moved there and - now live under pkgs.linuxKernel.packages.*. - The unversioned ones (such as - linuxPackages_latest) remain untouched. - - - - - In NixOS virtual machines (QEMU), the - virtualisation module has been updated with - new options: - - - - - forwardPorts - to configure IPv4 port forwarding, - - - - - sharedDirectories - to set up shared host directories, - - - - - resolution - to set the screen resolution, - - - - - useNixStoreImage - to use a disk image for the Nix store instead of 9P. - - - - - In addition, the default - msize - parameter in 9P filesystems (including /nix/store and all - shared directories) has been increased to 16K for improved - performance. - - - - - The setting - services.openssh.logLevel - "VERBOSE" - "INFO". This brings NixOS in line - with upstream and other Linux distributions, and reduces log - spam on servers due to bruteforcing botnets. - - - However, if - services.fail2ban.enable - is true, the fail2ban - will override the verbosity to - "VERBOSE", so that - fail2ban can observe the failed login - attempts from the SSH logs. - - - - - The - services.xserver.extraLayouts - no longer cause additional rebuilds when a layout is added or - modified. - - - - - Sway: The terminal emulator rxvt-unicode is - no longer installed by default via - programs.sway.extraPackages. The current - default configuration uses alacritty (and - soon foot) so this is only an issue when - using a customized configuration and not installing - rxvt-unicode explicitly. - - - - - python3 now defaults to Python 3.9. Python - 3.9 introduces many deprecation warnings, please look at the - What’s - New In Python 3.9 post for more information. - - - - - qtile hase been updated from - 0.16.0 to 0.18.0, please check - qtile - changelog for changes. - - - - - The claws-mail package now references the - new GTK+ 3 release branch, major version 4. To use the GTK+ 2 - releases, one can install the - claws-mail-gtk2 package. - - - - - The wordpress module provides a new interface which allows to - use different webservers with the new option - services.wordpress.webserver. - Currently httpd, caddy - and nginx are supported. The definitions of - wordpress sites should now be set in - services.wordpress.sites. - - - Sites definitions that use the old interface are automatically - migrated in the new option. This backward compatibility will - be removed in 22.05. - - - - - The dokuwiki module provides a new interface which allows to - use different webservers with the new option - services.dokuwiki.webserver. - Currently caddy and - nginx are supported. The definitions of - dokuwiki sites should now be set in - services.dokuwiki.sites. - - - Sites definitions that use the old interface are automatically - migrated in the new option. This backward compatibility will - be removed in 22.05. - - - - - The order of NSS (host) modules has been brought in line with - upstream recommendations: - - - - - The myhostname module is placed before - the resolve (optional) and - dns entries, but after - file (to allow overriding via - /etc/hosts / - networking.extraHosts, and prevent ISPs - with catchall-DNS resolvers from hijacking - .localhost domains) - - - - - The mymachines module, which provides - hostname resolution for local containers (registered with - systemd-machined) is placed to the - front, to make sure its mappings are preferred over other - resolvers. - - - - - If systemd-networkd is enabled, the - resolve module is placed before - files and - myhostname, as it provides the same - logic internally, with caching. - - - - - The mdns(_minimal) module has been - updated to the new priorities. - - - - - If you use your own NSS host modules, make sure to update your - priorities according to these rules: - - - - - NSS modules which should be queried before - resolved DNS resolution should use - mkBefore. - - - - - NSS modules which should be queried after - resolved, files and - myhostname, but before - dns should use the default priority - - - - - NSS modules which should come after dns - should use mkAfter. - - - - - - - The - networking.wireless - module (based on wpa_supplicant) has been heavily reworked, - solving a number of issues and adding useful features: - - - - - The automatic discovery of wireless interfaces at boot has - been made reliable again (issues - #101963, - #23196). - - - - - WPA3 and Fast BSS Transition (802.11r) are now enabled by - default for all networks. - - - - - Secrets like pre-shared keys and passwords can now be - handled safely, meaning without including them in a - world-readable file - (wpa_supplicant.conf under /nix/store). - This is achieved by storing the secrets in a secured - environmentFile - and referring to them though environment variables that - are expanded inside the configuration. - - - - - With multiple interfaces declared, independent - wpa_supplicant daemons are started, one for each interface - (the services are named - wpa_supplicant-wlan0, - wpa_supplicant-wlan1, etc.). - - - - - The generated wpa_supplicant.conf file - is now formatted for easier reading. - - - - - A new - scanOnLowSignal - option has been added to facilitate fast roaming between - access points (enabled by default). - - - - - A new - networks.<name>.authProtocols - option has been added to change the authentication - protocols used when connecting to a network. - - - - - - - The - networking.wireless.iwd - module has a new - networking.wireless.iwd.settings - option. - - - - - The - services.smokeping.host - option was added and defaulted to - localhost. Before, - smokeping listened to all interfaces by - default. NixOS defaults generally aim to provide - non-Internet-exposed defaults for databases and internal - monitoring tools, see e.g. - #100192. - Further, the systemd service for smokeping - got reworked defaults for increased operational stability, see - PR - #144127 for details. - - - - - The - services.syncoid.enable - module now properly drops ZFS permissions after usage. Before - it delegated permissions to whole pools instead of datasets - and didn’t clean up after execution. You can manually look - this up for your pools by running - zfs allow your-pool-name and use - zfs unallow syncoid your-pool-name to clean - this up. - - - - - Zfs: latestCompatibleLinuxPackages is now - exported on the zfs package. One can use - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - to always track the latest compatible kernel with a given - version of zfs. - - - - - Nginx will use the value of - sslTrustedCertificate if provided for a - virtual host, even if enableACME is set. - This is useful for providers not using the same certificate to - sign OCSP responses and server certificates. - - - - - lib.formats.yaml’s - generate will not generate JSON anymore, - but instead use more of the YAML-specific syntax. - - - - - MariaDB was upgraded from 10.5.x to 10.6.x. Please read the - upstream - release notes for changes and upgrade instructions. - - - - - The MariaDB C client library, also known as libmysqlclient or - mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While - this should hopefully not have any impact, this upgrade comes - with some changes to default behavior, so you might want to - review the - upstream - release notes. - - - - - GNOME desktop environment now enables - QGnomePlatform as the Qt platform theme, - which should avoid crashes when opening file chooser dialogs - in Qt apps by using XDG desktop portal. Additionally, it will - make the apps fit better visually. - - - - - rofi has been updated from - 1.6.1 to 1.7.0, one important - thing is the removal of the old xresources based configuration - setup. Read more - in - rofi’s changelog. - - - - - ipfs now defaults to not listening on you local network. This - setting was change as server providers won’t accept port - scanning on their private network. If you have several ipfs - instances running on a network you own, feel free to change - the setting ipfs.localDiscovery = true;. - localDiscovery enables different instances to discover each - other and share data. - - - - - lua and luajit - interpreters have been patched to avoid looking into /usr/lib - directories, thus increasing the purity of the build. - - - - - Three new options, - xdg.mime.addedAssociations, - xdg.mime.defaultApplications, - and - xdg.mime.removedAssociations - have been added to the - xdg.mime module to - allow the configuration of - /etc/xdg/mimeapps.list. - - - - - Kopia was upgraded from 0.8.x to 0.9.x. Please read the - upstream - release notes for changes and upgrade instructions. - - - - - The systemd.network module has gained - support for the FooOverUDP link type. - - - - - The networking module has a new - networking.fooOverUDP option to configure - Foo-over-UDP encapsulations. - - - - - networking.sits now supports Foo-over-UDP - encapsulation. - - - - - The virtualisation.libvirtd module has been - refactored and updated with new options: - - - - - virtualisation.libvirtd.qemu* options - (e.g.: - virtualisation.libvirtd.qemuRunAsRoot) - were moved to - virtualisation.libvirtd.qemu - submodule, - - - - - software TPM1/TPM2 support (e.g.: Windows 11 guests) - (virtualisation.libvirtd.qemu.swtpm), - - - - - custom OVMF package (e.g.: - pkgs.OVMFFull with HTTP, CSM and Secure - Boot support) - (virtualisation.libvirtd.qemu.ovmf.package). - - - - - - - The cawbird Twitter client now uses its own - API keys to count as different application than upstream - builds. This is done to evade application-level rate limiting. - While existing accounts continue to work, users may want to - remove and re-register their account in the client to enjoy a - better user experience and benefit from this change. - - - - - A new option - services.prometheus.enableReload has been - added which can be enabled to reload the prometheus service - when its config file changes instead of restarting. - - - - - The option - services.prometheus.environmentFile has - been removed since it was causing - issues - and Prometheus now has native support for secret files, i.e. - basic_auth.password_file and - authorization.credentials_file. - - - - - Dokuwiki now supports caddy! However - - - - - the nginx option has been removed, in the new - configuration, please use the - dokuwiki.webserver = "nginx" - instead. - - - - - The ${hostname} option has been deprecated, - please use - dokuwiki.sites = [ "${hostname}" ] - instead - - - - - - - The - services.unifi - module has been reworked, solving a number of issues. This - leads to several user facing changes: - - - - - The services.unifi.dataDir option is - removed and the data is now always located under - /var/lib/unifi/data. This is done to - make better use of systemd state direcotiry and thus - making the service restart more reliable. - - - - - The unifi logs can now be found under: - /var/log/unifi instead of - /var/lib/unifi/logs. - - - - - The unifi run directory can now be found under: - /run/unifi instead of - /var/lib/unifi/run. - - - - - - - security.pam.services.<name>.makeHomeDir - now uses umask=0077 instead of - umask=0022 when creating the home - directory. - - - - - Loki has had another release. Some default values have been - changed for the configuration and some configuration options - have been renamed. For more details, please check - the - upgrade guide. - - - - - julia now refers to - julia-stable instead of - julia-lts. In practice this means it has - been upgraded from 1.0.4 to - 1.5.4. - - - - - RetroArch has been upgraded from version - 1.8.5 to 1.9.13.2. Since - the previous release was quite old, if you’re having issues - after the upgrade, please delete your - $XDG_CONFIG_HOME/retroarch/retroarch.cfg - file. - - - - - hydrus has been upgraded from version 438 - to 463. Since upgrading between releases - this old is advised against, be sure to have a backup of your - data before upgrading. For details, see - the - hydrus manual. - - - - - More jdk and jre versions are now exposed via - java-packages.compiler. - - - - - The sets haskell.packages and - haskell.compiler now contain for every ghc - version an attribute with the minor version dropped. E.g. for - ghc8107 there also now exists - ghc810. Those attributes point to the same - compilers and packagesets but have the advantage that e.g. - ghc92 stays stable when we update from - ghc925 to ghc926. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml deleted file mode 100644 index 64217c53c3b8..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ /dev/null @@ -1,2840 +0,0 @@ -
- Release 22.05 (“Quokka”, 2022.05/30) - - - - Support is planned until the end of December 2022, handing over - to 22.11. - - - -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Nix has been updated from 2.3 to 2.8. This mainly brings - experimental support for Flakes, but also marks the - nix command as experimental which now has - to be enabled via the configuration explicitly. For more - information and instructions for upgrades, see the relase - notes for - nix-2.4, - nix-2.5, - nix-2.6, - nix-2.7 - and - nix-2.8 - - - - - The firefox browser on - x86_64-linux now makes use of - profile-guided optimisation, resulting in a much more - responsive browsing experience. - - - - - GNOME has been upgraded to 42. Please take a look at their - Release - Notes for details. In particular, it replaces gedit - with GNOME Text Editor, GNOME Terminal with GNOME Console - (formerly King’s Cross) and GNOME Screenshot by a tool - integrated into the Shell. - - - - - PHP 8.1 is now available. - - - - - systemd services can now set - systemd.services.<name>.reloadTriggers - instead of reloadIfChanged for a more - granular distinction between reloads and restarts. - - - - - Systemd has been upgraded to the version 250. - - - - - Pulseaudio has been updated to version 15.0 and now optionally - supports - additional Bluetooth audio codecs such as aptX or LDAC, - with codec switching available in - pavucontrol. This feature is disabled by - default, but can be enabled with the option - hardware.pulseaudio.package = pkgs.pulseaudioFull;. - Existing third-party modules that offered similar functions, - such as pulseaudio-modules-bt or - pulseaudio-hsphfpd, are obsolete and have - been removed. - - - - - PostgreSQL now defaults to major version 14. - - - - - Module authors can use - mkRenamedOptionModuleWith to automate the - deprecation cycle without annoying out-of-tree module authors - and their users. - - - - - The default GHC version has been updated from 8.10.7 to 9.0.2. - pkgs.haskellPackages and - pkgs.ghc will now use this version by - default. - - - - - The GNOME and Plasma installation CDs now use - pkgs.calamares and - pkgs.calamares-nixos-extensions to allow - users to easily install and set up NixOS with a GUI. - - - - - security.acme.defaults has been added to - simplify the configuration of settings for many certificates - at once. This also opens up the option to use DNS-01 - validation when using enableACME web server - virtual hosts (e.g. - services.nginx.virtualHosts.*.enableACME). - - - -
-
- New Services - - - - 1password, - command-lines and graphic interface for 1Password. Available - as - programs._1password - and - programs._1password-gui. - - - - - aesmd, - the Intel SGX Architectural Enclave Service Manager. Available - as - services.aesmd. - - - - - agate, - a very simple server for the Gemini hypertext protocol. - Available as - services.agate. - - - - - apfs, - a kernel module for mounting the Apple File System (APFS). - - - - - argonone, - a replacement daemon for the Raspberry Pi Argon One power - button and cooler. Available at - services.hardware.argonone. - - - - - ArchiSteamFarm, - a C# application with primary purpose of idling Steam cards - from multiple accounts simultaneously. Available as - services.archisteamfarm. - - - - - BaGet, - a lightweight NuGet and symbol server. Available at - services.baget. - - - - - bird-lg, - a BGP looking glass for Bird Routing. Available as - services.bird-lg. - - - - - blocky, - fast and lightweight DNS proxy as ad-blocker for local network - with many features. Available as - services.blocky. - - - - - cloudflare-dyndns, - CloudFlare Dynamic DNS client. Available as - services.cloudflare-dyndns. - - - - - Corosync - and - Pacemaker, - A open-source high availability resource manager. Available as - services.corosync - and - services.pacemaker. - - - - - create_ap, - a module for creating wifi hotspots using the program - linux-wifi-hotspot. Available as - services.create_ap. - - - - - Envoy, a - high-performance reverse proxy. Available as - services.envoy. - - - - - ergochat, a modern - IRC with IRCv3 features. Available as - services.ergochat. - - - - - ethercalc, - an online collaborative spreadsheet. Available as - services.ethercalc. - - - - - filebeat, - a lightweight shipper for forwarding and centralizing log - data. Available as - services.filebeat. - - - - - FRRouting, a - popular suite of Internet routing protocol daemons (BGP, BFD, - OSPF, IS-IS, VRRP and others). Available as - services.frr. - - - - - Grafana - Mimir, an open source, horizontally scalable, highly - available, multi-tenant, long-term storage for Prometheus. - Available as - services.mimir. - - - - - Haste, - a pastebin written in node.js. Available as - services.haste. - - - - - headscale, - an Open Source implementation of the - Tailscale - Control Server. Available as - services.headscale. - - - - - heisenbridge, - a bouncer-style Matrix IRC bridge. Available as - services.heisenbridge. - - - - - https-dns-proxy, - DNS to DNS over HTTPS (DoH) proxy. Available as - services.https-dns-proxy. - - - - - input-remapper, - an easy to use tool to change the mapping of your input device - buttons. Available at - services.input-remapper. - - - - - InvoicePlane, - web application for managing and creating invoices. Available - at - services.invoiceplane. - - - - - k3b, - the KDE disk burning application. Available as - programs.k3b. - - - - - K40-Whisperer, - a program to control cheap Chinese laser cutters. Available as - programs.k40-whisperer.enable. - Users must add themselves to the k40 group - to be able to access the device. - - - - - kanidm, - an identity management server written in Rust. Available as - services.kanidm - - - - - Maddy, a free - an open source mail server. Available as - services.maddy. - - - - - matrix-conduit, - a simple, fast and reliable chat server powered by matrix. - Available as - services.matrix-conduit. - - - - - Moosefs, fault - tolerant petabyte distributed file system. Available as - moosefs. - - - - - mozillavpn, - the client for the - Mozilla VPN - service. Available as - services.mozillavpn. - - - - - mtr-exporter, - a Prometheus exporter for mtr metrics. Available as - services.mtr-exporter. - - - - - nbd, a - Network Block Device server. Available as - services.nbd. - - - - - netbox, - infrastructure resource modeling (IRM) tool. Available as - services.netbox. - - - - - nethoscope, - listen to your network traffic. Available as - programs.nethoscope. - - - - - nifi, an - easy to use, powerful, and reliable system to process and - distribute data. Available as - services.nifi. - - - - - nix-ld, - Run unpatched dynamic binaries on NixOS. Available as - programs.nix-ld. - - - - - NNCP, NNCP - (Node to Node copy) utilities and configuration, Available as - programs.nncp. - - - - - pgadmin4, - an admin interface for the PostgreSQL database. Available at - services.pgadmin. - - - - - PowerDNS-Admin, - a web interface for the PowerDNS server. Available at - services.powerdns-admin. - - - - - prometheus-pve-exporter, - a tool that exposes information from the Proxmox VE API for - use by Prometheus. Available as - services.prometheus.exporters.pve. - - - - - prosody-filer, - a server for handling XMPP HTTP Upload requests. Available at - services.prosody-filer. - - - - - Public - Inbox, an archives first approach to - mailing lists. Available as - services.public-inbox. - - - - - r53-ddns, - a small tool to run your own DDNS service via AWS Route53. - Available as - services.r53-ddns. - - - - - rmfakecloud, - a clone of the cloud sync the remarkable tablet. Available as - services.rmfakecloud. - - - - - rootless - Docker, a systemd --user Docker - service which runs without root permissions. Available as - virtualisation.docker.rootless.enable. - - - - - rstudio-server, - a browser-based version of the RStudio IDE for the R - programming language. Available as - services.rstudio-server. - - - - - rtsp-simple-server, - ready-to-use RTSP / RTMP / HLS server and proxy that allows to - read, publish and proxy video and audio streams. Available as - services.rtsp-simple-server. - - - - - Snipe-IT, a - free open source IT asset/license management system. Available - as - services.snipe-it. - - - - - snowflake-proxy, - a system to defeat internet censorship. Available as - services.snowflake-proxy. - - - - - sslmate-agent, - a daemon for managing SSL/TLS certificates on a server. - Available as - services.sslmate-agent. - - - - - starship, a - minimal, blazing-fast, and infinitely customizable prompt for - any shell. Available at - programs.startship. - - - - - systembus-notify, - allow system level notifications to reach the users. Available - as - services.systembus-notify. - Please keep in mind that this service should only be enabled - on machines with fully trusted users, as any local user is - able to DoS user sessions by spamming notifications. - - - - - teleport, - allows engineers and security professionals to unify access - for SSH servers, Kubernetes clusters, web applications, and - databases across all environments. Available at - services.teleport. - - - - - tetrd, share your - internet connection from your device to your PC and vice versa - through a USB cable. Available at - services.tetrd. - - - - - uptermd, an - open-source solution for sharing terminal sessions instantly - over the public internet via secure tunnels. Available at - services.uptermd. - - - - - usbrelayd, - an USB Relay MQTT daemon. Available as - services.usbrelayd. - - - - - webdav-server-rs, - Webdav server in rust. Available as - services.webdav-server-rs. - - - - - wg-netmanager, - the Wireguard network manager. Available as - services.wg-netmanager. - - - - - Zammad, a - web-based, open source user support/ticketing solution. - Available as - services.zammad. - - - -
-
- Backward Incompatibilities - - - - pkgs.ghc now refers to - pkgs.targetPackages.haskellPackages.ghc. - This only makes a difference if you are - cross-compiling and will ensure that - pkgs.ghc always runs on the host platform - and compiles for the target platform (similar to - pkgs.gcc for example). - haskellPackages.ghc still behaves as - before, running on the build platform and compiling for the - host platform (similar to stdenv.cc). This - means you don’t have to adjust your derivations if you use - haskellPackages.callPackage, but when using - pkgs.callPackage and taking - ghc as an input, you should now use - buildPackages.ghc instead to ensure cross - compilation keeps working (or switch to - haskellPackages.callPackage). - - - - - pkgs.ghc.withPackages as well as - haskellPackages.ghcWithPackages etc. now - needs be overridden directly, as opposed to overriding the - result of calling it. Additionally, the - withLLVM parameter has been renamed to - useLLVM. So instead of - (ghc.withPackages (p: [])).override { withLLVM = true; }, - one needs to use - (ghc.withPackages.override { useLLVM = true; }) (p: []). - - - - - The update of the haskell package set brings with it a new - version of the xmonad module, which will - break your configuration if you use launch - as entrypoint. The example code the corresponding nixos module - was adjusted, you may want to have a look at it. - - - - - The home-assistant module now requires - users that don’t want their configuration to be managed - declaratively to set - services.home-assistant.config = null;. - This is required due to the way default settings are handled - with the new settings style. - - - Additionally the default list of - extraComponents now includes the minimal - dependencies to successfully complete the - onboarding - procedure. - - - - - pkgs.emacsPackages.orgPackages is removed - because org elpa is deprecated. The packages in the top level - of pkgs.emacsPackages, such as org and - org-contrib, refer to the ones in - pkgs.emacsPackages.elpaPackages and - pkgs.emacsPackages.nongnuPackages where the - new versions will release. - - - - - The configuration and state directories used by - nixos-containers have been moved from - /etc/containers and - /var/lib/containers to - /etc/nixos-containers and - /var/lib/nixos-containers. - - - If you are changing system.stateVersion to - "22.05" manually on an existing - system you are responsible for migrating these directories - yourself. - - - This is to improve compatibility with - libcontainer based software such as Podman - and Skopeo which assumes they have ownership over - /etc/containers. - - - - - lib.systems.supported has been removed, as - it was overengineered for determining the systems to support - in the nixpkgs flake. The list of systems exposed by the - nixpkgs flake can now be accessed as - lib.systems.flakeExposed. - - - - - For new installations - virtualisation.oci-containers.backend is - now set to podman by default. If you still - want to use Docker on systems where - system.stateVersion is set to to - "22.05" set - virtualisation.oci-containers.backend = "docker";.Old - systems with older stateVersions stay with - docker. - - - - - security.klogd was removed. Logging of - kernel messages is handled by systemd since Linux 3.5. - - - - - pkgs.ssmtp has been dropped due to the - program being unmaintained. pkgs.msmtp can - be used instead as a substitute sendmail - implementation. The corresponding options - services.ssmtp.* have been removed as well. - programs.msmtp.* can be used instead for an - equivalent setup. For example: - - -{ - # Original ssmtp configuration: - services.ssmtp = { - enable = true; - useTLS = true; - useSTARTTLS = true; - hostName = "smtp.example:587"; - authUser = "someone"; - authPassFile = "/secrets/password.txt"; - }; - - # Equivalent msmtp configuration: - programs.msmtp = { - enable = true; - accounts.default = { - tls = true; - tls_starttls = true; - auth = true; - host = "smtp.example"; - port = 587; - user = "someone"; - passwordeval = "cat /secrets/password.txt"; - }; - }; -} - - - - - services.kubernetes.addons.dashboard was - removed due to it being an outdated version. - - - - - services.kubernetes.scheduler.{port,address} - now set --secure-port and - --bind-address instead of - --port and --address, - since the former have been deprecated and are no longer - functional in kubernetes>=1.23. Ensure that you are not - relying on the insecure behaviour before upgrading. - - - - - In the PowerDNS Recursor module - (services.pdns-recursor), default values of - several IP address-related NixOS options have been updated to - match the default upstream behavior. In particular, Recursor - by default will: - - - - - listen on (and allows connections from) both IPv4 and IPv6 - addresses - (services.pdns-recursor.dns.address, - services.pdns-recursor.dns.allowFrom); - - - - - allow only local connections to the REST API server - (services.pdns-recursor.api.allowFrom). - - - - - - - In the ncdns module, the default value of - services.ncdns.address has been changed to - the IPv6 loopback address (::1). - - - - - openldap (and therefore the slapd LDAP - server) were updated to version 2.6.2. The project introduced - backwards-incompatible changes, namely the removal of the bdb, - hdb, ndb, and shell backends in slapd. Therefore before - updating, dump your database slapcat -n 1 - in LDIF format, and reimport it after updating your - services.openldap.settings, which - represents your cn=config. - - - Additionally with 2.5 the argon2 module was included in the - standard distrubtion and renamed from - pw-argon2 to argon2. - Remember to update your olcModuleLoad entry - in cn=config. - - - - - openssh has been update to 8.9p1, changing - the FIDO security key middleware interface. - - - - - git no longer hardcodes the path to - openssh’ ssh binary to reduce the amount of rebuilds. If you - are using git with ssh remotes and do not have a ssh binary in - your enviroment consider adding openssh to - it or switching to gitFull. - - - - - services.k3s.enable no longer implies - systemd.enableUnifiedCgroupHierarchy = false, - and will default to the systemd cgroup driver - when using services.k3s.docker = true. This - change may require a reboot to take effect, and k3s may not be - able to run if the boot cgroup hierarchy does not match its - configuration. The previous behavior may be retained by - explicitly setting - systemd.enableUnifiedCgroupHierarchy = false - in your configuration. - - - - - fonts.fonts no longer includes ancient - bitmap fonts when both - config.services.xserver.enable and - config.nixpkgs.config.allowUnfree are - enabled. If you still want these fonts, use: - - -{ - fonts.fonts = [ - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi - ]; -} - - - - - services.prometheus.alertManagerTimeout has - been removed as it has been deprecated upstream and has no - effect. - - - - - The DHCP server (services.dhcpd4, - services.dhcpd6) has been hardened. The - service is now using the systemd’s - DynamicUser mechanism to run as an - unprivileged dynamically-allocated user with limited - capabilities. The dhcpd state files are now always stored in - /var/lib/dhcpd{4,6} and the - services.dhcpd4.stateDir and - service.dhcpd6.stateDir options have been - removed. If you were depending on root privileges or - set{uid,gid,cap} binaries in dhcpd shell hooks, you may give - dhcpd more capabilities with e.g. - systemd.services.dhcpd6.serviceConfig.AmbientCapabilities. - - - - - The mailpile email webclient - (services.mailpile) has been removed due to - its reliance on python2. - - - - - services.ipfs.extraFlags is now escaped - with utils.escapeSystemdExecArgs. If you - rely on systemd interpolating extraFlags in - the service ExecStart, this will no longer - work. - - - - - hbase version 0.98.24 has been removed. The - package now defaults to version 2.4.11. Versions 1.7.1 and - 3.0.0-alpha-2 are also available. - - - - - services.paperless-ng was renamed to - services.paperless. Accordingly, the - paperless-ng-manage script (located in - dataDir) was renamed to - paperless-manage. - services.paperless now uses - paperless-ngx. - - - - - The matrix-synapse service - (services.matrix-synapse) has been - converted to use the settings option - defined in RFC42. This means that options that are part of - your homeserver.yaml configuration, and - that were specified at the top-level of the module - (services.matrix-synapse) now need to be - moved into - services.matrix-synapse.settings. And while - not all options you may use are defined in there, they are - still supported, because you can set arbitrary values in this - freeform type. - - - The listeners.*.bind_address option was - renamed to bind_addresses in order to match - the upstream homeserver.yaml option name. - It is now also a list of strings instead of a string. - - - An example to make the required migration clearer: - - - Before: - - -{ - services.matrix-synapse = { - enable = true; - - server_name = "example.com"; - public_baseurl = "https://example.com:8448"; - - enable_registration = false; - registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; - macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; - - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - - listeners = [ { - port = 8448; - bind_address = ""; - type = "http"; - tls = true; - resources = [ { - names = [ "client" ]; - compress = true; - } { - names = [ "federation" ]; - compress = false; - } ]; - } ]; - - }; -} - - - After: - - -{ - services.matrix-synapse = { - enable = true; - - # this attribute set holds all values that go into your homeserver.yaml configuration - # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for - # possible values. - settings = { - server_name = "example.com"; - public_baseurl = "https://example.com:8448"; - - enable_registration = false; - # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead - - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - - listeners = [ { - port = 8448; - bind_addresses = [ - "::" - "0.0.0.0" - ]; - type = "http"; - tls = true; - resources = [ { - names = [ "client" ]; - compress = true; - } { - names = [ "federation" ]; - compress = false; - } ]; - } ]; - }; - - extraConfigFiles = [ - "/run/keys/matrix-synapse/secrets.yaml" - ]; - }; -} - - - The secrets in your original config should be migrated into a - YAML file that is included via - extraConfigFiles. The filename must be - quoted to prevent nix from copying it to the (world readable) - store. - - - Additionally a few option defaults have been synced up with - upstream default values, for example the - max_upload_size grew from - 10M to 50M. For the same - reason, the default media_store_path was - changed from ${dataDir}/media to - ${dataDir}/media_store if - system.stateVersion is at least - 22.05. Files will need to be manually moved - to the new location if the stateVersion is - updated. - - - As of Synapse 1.58.0, the old groups/communities feature has - been disabled by default. It will be completely removed with - Synapse 1.61.0. - - - - - The Keycloak package (pkgs.keycloak) has - been switched from the Wildfly version, which will soon be - deprecated, to the Quarkus based version. The Keycloak service - (services.keycloak) has been updated to - accommodate the change and now differs from the previous - version in a few ways: - - - - - services.keycloak.extraConfig has been - removed in favor of the new - settings-style - services.keycloak.settings - option. The available options correspond directly to - parameters in conf/keycloak.conf. Some - of the most important parameters are documented as - suboptions, the rest can be found in the - All - configuration section of the Keycloak Server Installation - and Configuration Guide. While the new - configuration is much simpler and cleaner than the old - JBoss CLI one, this unfortunately mean that there’s no - straightforward way to convert an old configuration to the - new format and some settings may not even be available - anymore. - - - - - services.keycloak.frontendUrl was - removed and the frontend URL is now configured through the - hostname family of settings in - services.keycloak.settings - instead. See the - Hostname - section of the Keycloak Server Installation and - Configuration Guide for more details. Additionally, - /auth was removed from the default - context path and needs to be added back in - services.keycloak.settings.http-relative-path - if you want to keep compatibility with your current - clients. - - - - - services.keycloak.bindAddress, - services.keycloak.forceBackendUrlToFrontendUrl, - services.keycloak.httpPort and - services.keycloak.httpsPort have been - removed in favor of their equivalent options in - services.keycloak.settings. - httpPort and - httpsPort have additionally had their - types changed from str to - port. - - - The new names are as follows: - - - - - bindAddress: - services.keycloak.settings.http-host - - - - - forceBackendUrlToFrontendUrl: - services.keycloak.settings.hostname-strict-backchannel - - - - - httpPort: - services.keycloak.settings.http-port - - - - - httpsPort: - services.keycloak.settings.https-port - - - - - - - For example, when using a reverse proxy the migration could - look like this: - - - Before: - - - services.keycloak = { - enable = true; - httpPort = "8080"; - frontendUrl = "https://keycloak.example.com/auth"; - database.passwordFile = "/run/keys/db_password"; - extraConfig = { - "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true; - }; - }; - - - After: - - - services.keycloak = { - enable = true; - settings = { - http-port = 8080; - hostname = "keycloak.example.com"; - http-relative-path = "/auth"; - proxy = "edge"; - }; - database.passwordFile = "/run/keys/db_password"; - }; - - - - - The MoinMoin wiki engine - (services.moinmoin) has been removed, - because Python 2 is being retired from nixpkgs. - - - - - Services in the hadoop module previously - set openFirewall to true by default. This - has now been changed to false. Node definitions for multi-node - clusters would need openFirewall = true; to - be added to to hadoop services when upgrading from NixOS - 21.11. - - - - - services.hadoop.yarn.nodemanager now uses - cgroup-based CPU limit enforcement by default. Additionally, - the option useCGroups was added to - nodemanagers as an easy way to switch back to the old - behavior. - - - - - The wafHook hook now honors - NIX_BUILD_CORES when - enableParallelBuilding is not set - explicitly. Packages can restore the old behaviour by setting - enableParallelBuilding=false. - - - - - pkgs.claws-mail-gtk2, representing Claws - Mail’s older release version three, was removed in order to - get rid of Python 2. Please switch to - claws-mail, which is Claws Mail’s latest - release based on GTK+3 and Python 3. - - - - - The writers.writePython2 and corresponding - writers.writePython2Bin convenience - functions to create executable Python 2 scripts in the store - were removed in preparation of removal of the Python 2 - interpreter. Scripts have to be converted to Python 3 for use - with writers.writePython3 or - writers.writePyPy2 needs to be used. - - - - - buildGoModule was updated to use - go_1_17, third party derivations that - specify >= go 1.17 in the main go.mod - will need to regenerate their vendorSha256 - hash. - - - - - The gnome-passwordsafe package updated to - version - 6.x and renamed to gnome-secrets. - - - - - services.gnome.experimental-features.realtime-scheduling - option has been removed, as GNOME Shell now - uses - rtkit. Use - security.rtkit.enable = true; instead. As - before, you will need to have it enabled using GSettings. - - - - - services.telepathy will no longer be - enabled by default for GNOME desktops, one should enable it in - their configs if using Empathy or Polari. - - - - - If you previously used - /etc/docker/daemon.json, you need to - incorporate the changes into the new option - virtualisation.docker.daemon.settings. - - - - - Ntopng (services.ntopng) is updated to - 5.2.1 and uses a separate Redis instance if - system.stateVersion is at least - 22.05. Existing setups shouldn’t be - affected. - - - - - The backward compatibility in - services.wordpress to configure sites with - the old interface has been removed. Please use - services.wordpress.sites instead. - - - - - The backward compatibility in - services.dokuwiki to configure sites with - the old interface has been removed. Please use - services.dokuwiki.sites instead. - - - - - opensmtpd-extras is no longer build with python2 scripting - support due to python2 deprecation in nixpkgs - - - - - services.miniflux.adminCredentialFiles is - now required, instead of defaulting to - admin and password. - - - - - The taskserver module no longer implicitly - opens ports in the firewall configuration. This is now - controlled through the option - services.taskserver.openFirewall. - - - - - The autorestic package has been upgraded - from 1.3.0 to 1.5.0 which introduces breaking changes in - config file, check - their - migration guide for more details. - - - - - teleport has been upgraded to major version - 9. Please see upstream - upgrade - instructions and - release - notes. - - - - - For pkgs.python3.pkgs.ipython, its direct - dependency - pkgs.python3.pkgs.matplotlib-inline (which - is really an adapter to integrate matplotlib in ipython if it - is installed) does not depend on - pkgs.python3.pkgs.matplotlib anymore. This - is closer to a non-Nix install of ipython. This has the added - benefit to reduce the closure size of - ipython from ~400MB to ~160MB (including - ~100MB for python itself). - - - - - documentation.man has been refactored to - support choosing a man implementation other than GNU’s - man-db. For this, - documentation.man.manualPages has been - renamed to - documentation.man.man-db.manualPages. If - you want to use the new alternative man implementation - mandoc, add - documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; } - to your configuration. - - - - - Normal users (with isNormalUser = true) - which have non-empty subUidRanges or - subGidRanges set no longer have additional - implicit ranges allocated. To enable automatic allocation back - set autoSubUidGidRange = true. - - - - - idris2 now requires - --package when using packages - contrib and network, - while previously these idris2 packages were automatically - loaded. - - - - - The iputils package, which is installed by default, no longer - provides the legacy tools tftpd and - traceroute6. More tools - (ninfod, rarpd, and - rdisc) are going to be removed in the next - release. See - upstream’s - release notes for more details and available - replacements. - - - - - services.thelounge.private was removed in - favor of services.thelounge.public, to - follow with upstream changes. - - - - - pkgs.docbookrx was removed since it’s - unmaintained - - - - - pkgs._7zz is now correctly licensed as - LGPL3+ and BSD3 with optional unfree unRAR licensed code - - - - - The vim.customize function produced by - vimUtils.makeCustomizable now has a - slightly different interface: - - - - - The wrapper now includes everything in the given Vim - derivation if name is - "vim" (the default). This - makes the wrapManual argument obsolete, - but this behavior can be overridden by setting the - standalone argument. - - - - - All the executables present in the given derivation (or, - in standalone mode, only the - *vim ones) are wrapped. This makes the - wrapGui argument obsolete. - - - - - The vimExecutableName and - gvimExecutableName arguments were - replaced by a single executableName - argument in which the shell variable - $exe can be used to refer to the - wrapped executable’s name. - - - - - See the comments in - pkgs/applications/editors/vim/plugins/vim-utils.nix - for more details. - - - vimUtils.vimWithRC was removed. You should - instead use customize on a Vim derivation, - which now accepts vimrcFile and - gvimrcFile arguments. - - - - - tilp2 was removed together with its module - - - - - The F-PROT antivirus (fprot package) and - its service module were removed because it reached - end-of-life. - - - - - bird1 and its modules - services.bird as well as - services.bird6 have been removed. Upgrade - to services.bird2. - - - - - The options - networking.interfaces.<name>.ipv4.routes - and - networking.interfaces.<name>.ipv6.routes - are no longer ignored when using networkd instead of the - default scripted network backend by setting - networking.useNetworkd to - true. - - - - - The miller package has been upgraded from - 5.10.3 to - 6.2.0. - See - What’s - new in Miller 6. - - - - - MultiMC has been replaced with the fork PrismLauncher due to - upstream developers being hostile to 3rd party package - maintainers. PrismLauncher removes all MultiMC branding and is - aimed at providing proper 3rd party packages like the one - contained in Nixpkgs. This change affects the data folder - where game instances and other save and configuration files - are stored. Users with existing installations should rename - ~/.local/share/multimc to - ~/.local/share/PrismLauncher. The main - config file’s path has also moved from - ~/.local/share/multimc/multimc.cfg to - ~/.local/share/PrismLauncher/prismlauncher.cfg. - - - - - systemd-nspawn@.service settings have been - reverted to the default systemd behaviour. User namespaces are - now activated by default. If you want to keep running nspawn - containers without user namespaces you need to set - systemd.nspawn.<name>.execConfig.PrivateUsers = false - - - - - systemd-shutdown is now properly linked on - shutdown to unmount all filesystems and device mapper devices - cleanly. This can be disabled using - systemd.shutdownRamfs.enable. - - - - - The Tor SOCKS proxy is now actually disabled if - services.tor.client.enable is set to - false (the default). If you are using this - functionality but didn’t change the setting or set it to - false, you now need to set it to - true. - - - - - services.github-runner has been hardened. - Notably address families and system calls have been - restricted, which may adversely affect some kinds of testing, - e.g. using AF_BLUETOOTH to test bluetooth - devices. - - - - - The terraform 0.12 compatibility has been removed and the - terraform.withPlugins and - terraform-providers.mkProvider - implementations simplified. Providers now need to be stored - under - $out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version> - (which mkProvider does). - - - This breaks back-compat so it’s not possible to mix-and-match - with previous versions of nixpkgs. In exchange, it now becomes - possible to use the providers from - nixpkgs-terraform-providers-bin - directly. - - - - - The dendrite package has been upgraded from - 0.5.1 to - 0.6.5. - Instances configured with split sqlite databases, which has - been the default in NixOS, require merging of the federation - sender and signing key databases. See upstream - release - notes on version 0.6.0 for details on database changes. - - - - - The existing pkgs.opentelemetry-collector - has been moved to - pkgs.opentelemetry-collector-contrib to - match the actual source being the contrib - edition. pkgs.opentelemetry-collector is - now the actual core release of opentelemetry-collector. If you - use the community contributions you should change the package - you refer to. If you don’t need them update your commands from - otelcontribcol to - otelcorecol and enjoy a 7x smaller binary. - - - - - services.zookeeper has a new option - jre for specifying the JRE to start - zookeeper with. It defaults to the JRE that - pkgs.zookeeper was wrapped with, instead of - pkgs.jre. This changes the JRE to - pkgs.jdk11_headless by default. - - - - - pkgs.pgadmin now refers to - pkgs.pgadmin4. pgadmin3 - has been removed. - - - - - pkgs.minetestclient_4 and - pkgs.minetestserver_4 have been removed, as - the last 4.x release was in 2018. - pkgs.minetestclient (equivalent to - pkgs.minetest ) and - pkgs.minetestserver can be used instead. - - - - - pkgs.noto-fonts-cjk is now deprecated in - favor of pkgs.noto-fonts-cjk-sans and - pkgs.noto-fonts-cjk-serif because they each - have different release schedules. To maintain compatibility - with prior releases of Nixpkgs, - pkgs.noto-fonts-cjk is currently an alias - of pkgs.noto-fonts-cjk-sans and doesn’t - include serif fonts. - - - - - pkgs.epgstation has been upgraded from v1 - to v2, resulting in incompatible changes in the database - scheme and configuration format. - - - - - Some top-level settings under - services.epgstation - is now deprecated because it was redudant due to the same - options being present in - services.epgstation.settings. - - - - - The option services.epgstation.basicAuth - was removed because basic authentication support was dropped - by upstream. - - - - - The option - services.epgstation.database.passwordFile - no longer has a default value. Make sure to set this option - explicitly before upgrading. Change the database password if - necessary. - - - - - The - services.epgstation.settings - option now expects options for config.yml - in EPGStation v2. - - - - - Existing data for the - services.epgstation - module would have to be backed up prior to the upgrade. To - back up exising data to - /tmp/epgstation.bak, run - sudo -u epgstation epgstation run backup /tmp/epgstation.bak. - To import that data after to the upgrade, run - sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak - - - - - switch-to-configuration (the script that is - run when running nixos-rebuild switch for - example) has been reworked - - - - - The interface that allows activation scripts to restart - units has been streamlined. Restarting and reloading is - now done by a single file - /run/nixos/activation-restart-list that - honors restartIfChanged and - reloadIfChanged of the units. - - - - - Preferring to reload instead of restarting can still - be achieved using - /run/nixos/activation-reload-list. - - - - - - - The script now uses a proper ini-file parser to parse - systemd units. Some values are now only searched in one - section instead of in the entire unit. This is only - relevant for units that don’t use the NixOS systemd moule. - - - - - RefuseManualStop, - X-OnlyManualStart, - X-StopOnRemoval, - X-StopOnReconfiguration are only - searched in the [Unit] section - - - - - X-ReloadIfChanged, - X-RestartIfChanged, - X-StopIfChanged are only searched - in the [Service] section - - - - - - - - - The services.bookstack.cacheDir option has - been removed, since the cache directory is now handled by - systemd. - - - - - The services.bookstack.extraConfig option - has been replaced by - services.bookstack.config which implements - a - settings-style - configuration. - - - - - lib.assertMsg and - lib.assertOneOf no longer return - false if the passed condition is - false, throwing the - given error message instead (which makes the resulting error - message less cluttered). This will not impact the behaviour of - code using these functions as intended, namely as top-level - wrapper for assert conditions. - - - - - The vpnc package has been changed to use - GnuTLS instead of OpenSSL by default for licensing reasons. - - - - - The default version of nextcloud is - nextcloud24. Please note - that it’s not possible to - upgrade nextcloud across multiple major - versions! This means it’s e.g. not possible to upgrade from - nextcloud22 to - nextcloud24 in a single deploy and most - 21.11 users will have to upgrade to - nextcloud23 first. - - - - - pkgs.vimPlugins.onedark-nvim now refers to - navarasu/onedark.nvim - (formerly refers to - olimorris/onedarkpro.nvim). - - - - - services.pipewire.enable will default to - enabling the WirePlumber session manager instead of - pipewire-media-session. pipewire-media-session is deprecated - by upstream and not recommended, but can still be manually - enabled by setting - services.pipewire.media-session.enable to - true and - services.pipewire.wireplumber.enable to - false. - - - - - pkgs.makeDesktopItem has been refactored to - provide a more idiomatic API. Specifically: - - - - - All valid options as of FDO Desktop Entry specification - version 1.4 can now be passed in as explicit arguments - - - - - exec can now be null, for entries that - are not of type Application - - - - - mimeType argument is renamed to - mimeTypes for consistency - - - - - mimeTypes, - categories, - implements, - keywords, onlyShowIn - and notShowIn take lists of strings - instead of one string with semicolon separators - - - - - extraDesktopEntries renamed to - extraConfig for consistency - - - - - Actions should now be provided as an attrset - actions, the Actions - line will be autogenerated. - - - - - extraEntries is removed. - - - - - Additional validation is added both at eval time and at - build time. - - - - - See the vscode package for a more detailed - example. - - - - - Existing resholve* functions have been - renamed and nested under pkgs.resholve. - Update uses to: - - - - - resholvePackage -> - resholve.mkDerivation - - - - - resholveScript -> - resholve.writeScript - - - - - resholveScriptBin -> - resholve.writeScriptBin - - - - - - - pkgs.cosmopolitan no longer provides the - cosmoc command. It has been moved to - pkgs.cosmoc. - - - - - pkgs.graalvmXX-ce packages no longer - provide support for Python/Ruby/WASM, instead focusing only in - Java and Native Image Support. If you need to add support - back, please see the - pkgs.graalvmCEPackages.mkGraal function to - create your own customized version of GraalVM with support for - what you need. - - - -
-
- Other Notable Changes - - - - The option - services.redis.servers - was added to support per-application - redis-server which is more secure since - Redis databases are only mere key prefixes without any - configuration or ACL of their own. Backward-compatibility is - preserved by mapping old - services.redis.settings to - services.redis.servers."".settings, - but you are strongly encouraged to name each - redis-server instance after the application - using it, instead of keeping that nameless one. Except for the - nameless - services.redis.servers."" still - accessible at 127.0.0.1:6379, and to the - members of the Unix group redis through the - Unix socket /run/redis/redis.sock, all - other services.redis.servers.${serverName} - are only accessible by default to the members of the Unix - group redis-${serverName} through the Unix - socket /run/redis-${serverName}/redis.sock. - - - - - The option - virtualisation.vmVariant - was added to allow users to make changes to the - nixos-rebuild build-vm configuration that - do not apply to their normal system. - - - The config.system.build.vm attribute now - always exists and defaults to the value from - vmVariant. Configurations that import the - virtualisation/qemu-vm.nix module - themselves will override this value, such that - vmVariant is not used. - - - Similarly - virtualisation.vmVariantWithBootloader - was added. - - - - - The configuration portion of the nix-daemon - module has been reworked and exposed as - nix.settings: - - - - - Legacy options have been mapped to the corresponding - options under under - nix.settings - and will be deprecated when NixOS 21.11 reaches end of - life. - - - - - nix.buildMachines.publicHostKey - has been added. - - - - - - - kops - defaults to 1.23.2, which will enable - Instance - Metadata Service Version 2 and require tokens on new - clusters with Kubernetes >= 1.22. This will increase - security by default, but may break some types of workloads. - The default behaviour for - spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS - has changed from true to - false. Cilium now has - disable-cnp-status-updates: true by - default. Set this to false if you rely on the - CiliumNetworkPolicy status fields. Support for Kubernetes - 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS - 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been - removed. See the - 1.22 - release notes and - 1.23 - release notes for more details, including other - significant changes. - - - - - Mattermost has been upgraded to extended support version 6.3 - as the previously packaged extended support version 5.37 is - reaching - end of life. Migration may take some time, see the - changelog - and - important - upgrade notes. - - - - - The - writers.writePyPy2/writers.writePyPy3 - and corresponding - writers.writePyPy2Bin/writers.writePyPy3Bin - convenience functions to create executable Python 2/3 scripts - using the PyPy interpreter were added. - - - - - Some improvements have been made to the - hadoop module: - - - - - A gatewayRole option has been added, - for deploying hadoop cluster configuration files to a node - that does not have any active services - - - - - Support for older versions of hadoop have been added to - the module - - - - - Overriding and extending site XML files has been made - easier - - - - - - - The auto-upgrade service now accepts persistent (default: - true) parameter. By default auto-upgrade will now run - immediately if it would have been triggered at least once - during the time when the timer was inactive. - - - - - Mastodon now uses services.redis.servers to - start a new redis server, instead of using a global redis - server. This improves compatibility with other services that - use redis. - - - Note that this will recreate the redis database, although - according to the - Mastodon - docs, this is almost harmless: - -
- - Losing the Redis database is almost harmless: The only - irrecoverable data will be the contents of the Sidekiq - queues and scheduled retries of previously failed jobs. The - home and list feeds are stored in Redis, but can be - regenerated with tootctl. - -
- - If you do want to save the redis database, you can use the - following commands: - - -redis-cli save -cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb" - - - - - Peertube now uses services.redis.servers to start a new redis - server, instead of using a global redis server. This improves - compatibility with other services that use redis. - - - Redis database is used for storage only cache and job queue. - More information can be found here - - Peertube - architecture. - - - If you do want to save the redis database, you can use the - following commands before upgrade OS: - - -redis-cli save -sudo mkdir /var/lib/redis-peertube -sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb - - - - - Added the keter NixOS module. Keter reverse - proxies requests to your loaded application based on virtual - hostnames. - - - - - If you are using Wayland you can choose to use the Ozone - Wayland support in Chrome and several Electron apps by setting - the environment variable NIXOS_OZONE_WL=1 - (for example via - environment.sessionVariables.NIXOS_OZONE_WL = "1"). - This is not enabled by default because Ozone Wayland is still - under heavy development and behavior is not always flawless. - Furthermore, not all Electron apps use the latest Electron - versions. - - - - - A new option group - systemd.network.wait-online was added, with - options to configure - systemd-networkd-wait-online.service: - - - - - anyInterface allows specifying that the - network should be considered online when at - least one interface is online (useful on - laptops) - - - - - timeout defines how long to wait for - the network to come online - - - - - extraArgs for everything else - - - - - - - The influxdb2 package was split into - influxdb2-server and - influxdb2-cli, matching the split that took - place upstream. A combined influxdb2 - package is still provided in this release for backwards - compatibilty, but will be removed at a later date. - - - - - The unifi package was switched from - unifi6 to unifi7. Direct - downgrades from Unifi 7 to Unifi 6 are not possible and - require restoring from a backup made by Unifi 6. - - - - - programs.zsh.autosuggestions.strategy now - takes a list of strings instead of a string. - - - - - The asterisk and - asterisk-stable packages were switched from - asterisk_18 to the newly-packaged - asterisk_19. Asterisk 13 and 17 have been - removed as they have reached their end of life. - - - - - The services.unifi.openPorts option default - value of true is now deprecated and will be - changed to false in 22.11. Configurations - using this default will print a warning when rebuilt. - - - - - The services.unifi-video.openPorts option - default value of true is now deprecated and - will be changed to false in 22.11. - Configurations using this default will print a warning when - rebuilt. - - - - - security.acme certificates will now - correctly check for CA revokation before reaching their - minimum age. - - - - - Removing domains from - security.acme.certs._name_.extraDomainNames - will now correctly remove those domains during rebuild/renew. - - - - - MariaDB is now offered in several versions, not just the - newest one. So if you have a need for running MariaDB 10.4 for - example, you can now just set - services.mysql.package = pkgs.mariadb_104;. - In general, it is recommended to run the newest version, to - get the newest features, while sticking with an LTS version - will most likely provide a more stable experience. Sometimes - software is also incompatible with the newest version of - MariaDB. - - - - - The option - programs.ssh.enableAskPassword - was added, decoupling the setting of - SSH_ASKPASS from - services.xserver.enable. This allows easy - usage in non-X11 environments, e.g. Wayland. - - - - - programs.ssh.knownHosts - has gained an extraHostNames option to - augment hostNames. It is now possible to - use the attribute name of a knownHosts - entry as the primary host name and specify secondary host - names using extraHostNames without having - to duplicate the primary host name. - - - - - The services.stubby module was converted to - a - settings-style - configuration. - - - - - The option - services.xserver.desktopManager.runXdgAutostartIfNone - was added in order to automatically run XDG autostart files - for sessions without a desktop manager. This replaces helpers - like the dex package. - - - - - When setting - i18n.inputMethod.enabled - to fcitx5, it no longer creates - corresponding systemd user services. It now relies on XDG - autostart files to start and work properly in your desktop - sessions. If you are using only a window manager without a - desktop manager, you need to enable - services.xserver.desktopManager.runXdgAutostartIfNone - or using the dex package to make - fcitx5 work. - - - - - The option services.duplicati.dataDir has - been added to allow changing the location of duplicati’s - files. - - - - - The options boot.extraModprobeConfig and - boot.blacklistedKernelModules now also take - effect in the initrd by copying the file - /etc/modprobe.d/nixos.conf into the initrd. - - - - - nixos-generate-config now puts the dhcp - configuration in hardware-configuration.nix - instead of configuration.nix. - - - - - ORY Kratos was updated to version 0.9.0-alpha.3, which - introduces some breaking changes: - - - - - All endpoints at the Admin API are now exposed at - /admin/. For example, endpoint - https://kratos:4434/identities is now - exposed at - https://kratos:4434/admin/identities - - - - - Configuration key - selfservice.whitelisted_return_urls has - been renamed to allowed_return_urls - - - - - The password_identifier form field of - the password login strategy has been renamed to - identifier to make compatibility with - passwordless flows possible. - - - - - Instead of having a global - default_schema_url which developers - used to update their schema, you now need to define the - default_schema_id which must reference - schema ID in your config. - - - - - Calling /self-service/recovery without - flow ID or with an invalid flow ID while authenticated - will now respond with an error instead of redirecting to - the default page. - - - - - If you are relying on the SQLite images, update your - Docker Pull commands as follows: - - - - - docker pull oryd/kratos:{version} - - - - - - - Additionally, all passwords now have to be at least 8 - characters long. - - - - - For more details, see: - - - - - Release - Notes for v0.8.1-alpha-1 - - - - - Release - Notes for v0.8.2-alpha-1 - - - - - Release - Notes for v0.9.0-alpha-1 - - - - - Release - Notes for v0.9.0-alpha-3 - - - - - - - - - fetchFromSourcehut now allows fetching - repositories recursively using fetchgit or - fetchhg if the argument - fetchSubmodules is set to - true. - - - - - A module for declarative configuration of openconnect VPN - profiles was added under - networking.openconnect. - - - - - The element-desktop package now has an - useKeytar option (defaults to - true), which allows disabling - keytar and in turn - libsecret usage (which binds to native - credential managers / keychain libraries). - - - - - The option services.thelounge.plugins has - been added to allow installing plugins for The Lounge. Plugins - can be found in - pkgs.theLoungePlugins.plugins and - pkgs.theLoungePlugins.themes. - - - - - The option - services.xserver.videoDriver = [ "nvidia" ]; - will now also install - nvidia - VA-API drivers by default. - - - - - The firmwareLinuxNonfree package has been - renamed to linux-firmware. - - - - - It is now possible to specify wordlists to include as handy to - access environment variables using the - config.environment.wordlist configuration - options. - - - - - The services.mbpfan module was converted to - a - RFC - 0042 configuration. - - - - - The default value for - programs.spacefm.settings.graphical_su got - unset. It previously pointed to gksu which - has been removed. - - - - - The Dino XMPP client - was updated to 0.3, adding support for audio and video calls. - - - - - services.mattermost.plugins has been added - to allow the declarative installation of Mattermost plugins. - Plugins are automatically repackaged using autoPatchelf. - - - - - services.logrotate.enable - now defaults to true if any rotate path has been defined, and - some paths have been added by default. - - - - - The logrotate module also has been updated to freeform syntax: - services.logrotate.paths and - services.logrotate.extraConfig will work, - but issue deprecation warnings and - services.logrotate.settings - should now be used instead. - - - - - security.pam.ussh has been added, which - allows authorizing PAM sessions based on SSH - certificates held within an SSH agent, - using - pam-ussh. - - - - - The vscode-extensions.ionide.ionide-fsharp - package has been updated to 6.0.0 and now requires .NET 6.0. - - - - - The phpPackages.box package has been - updated from 2.7.5 to 3.16.0. See the - upgrade - guide for more details. - - - - - The zrepl package has been updated from - 0.4.0 to 0.5: - - - - - The RPC protocol version was bumped; all zrepl daemons in - a setup must be updated and restarted before replication - can resume. - - - - - A bug involving encrypt-on-receive has been fixed. Read - the - zrepl - documentation and check the output of - zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS - on the receiver. - - - - - - - The polybar package has been updated from - 3.5.7 to 3.6.2. See - the - changelog for more details. - - - - - Breaking changes include changes to escaping rules in - configuration values, changes in behavior when - encountering invalid tag names, and changes to - inter-process-messaging (IPC). - - - - - - - Renamed option - services.openssh.challengeResponseAuthentication - to - services.openssh.kbdInteractiveAuthentication. - Reason is that the old name has been deprecated upstream. - Using the old option name will still work, but produce a - warning. - - - - - services.autorandr now allows for adding - hooks and profiles declaratively. - - - - - The pomerium-cli command has been moved out - of the pomerium package into the - pomerium-cli package, following upstream’s - repository split. If you are using the - pomerium-cli command, you should now - install the pomerium-cli package. - - - - - The option - services.networking.networkmanager.enableFccUnlock - was added to support FCC unlock procedures. Since release - 1.18.4, the ModemManager daemon no longer automatically - performs the FCC unlock procedure by default. See - the - docs for more details. - - - - - programs.tmux has a new option - plugins that accepts a list of packages - from the tmuxPlugins group. The specified - packages are added to the system and loaded by - tmux. - - - - - The polkit service, available at - security.polkit.enable, is now disabled by - default. It will automatically be enabled through services and - desktop environments as needed. - - - - - mercury was updated to 22.01.1, which has - some breaking changes - (Mercury - 22.01 news). - - - - - xfsprogs was update to version 5.15, which enables inobtcount - and bigtime by default on filesystem creation. Support for - these features was added in kernel 5.10 and deemed stable in - kernel 5.15. If you want to be able to mount XFS filesystems - created with this release of xfsprogs on kernel releases older - than 5.10, you need to format them with - mkfs.xfs -m bigtime=0 -m inobtcount=0. - - - - - services.xserver.desktopManager.xfce now - includes Xfce’s screen locker, - xfce4-screensaver that is enabled by - default. You can disable it by setting - false to - services.xserver.desktopManager.xfce.enableScreensaver. - - - - - The hadoop package has added support for - aarch64-linux and - aarch64-darwin as of 3.3.1 - (#158613). - - - - - The R package now builds again on - aarch64-darwin - (#158992). - - - - - The nss package was split into - nss_esr and nss_latest, - with nss being an alias for - nss_esr. This was done to ease maintenance - of nss and dependent high-profile packages - like firefox. - - - - - The default scribus version is now 1.5, - while version 1.4 is still available as - scribus_1_4 - (#172700). - - - - - The Nextcloud module now supports to create a Mysql database - automatically with - services.nextcloud.database.createLocally - enabled. - - - - - The Nextcloud module now allows setting the value of the - max-age directive of the - Strict-Transport-Security HTTP header, - which is now controlled by the - services.nextcloud.https option, rather - than services.nginx.recommendedHttpHeaders. - - - - - The spark3 package has been updated from - 3.1.2 to 3.2.1 - (#160075): - - - - - Testing has been enabled for - aarch64-linux in addition to - x86_64-linux. - - - - - The spark3 package is now usable on - aarch64-darwin as a result of - #158613 - and - #158992. - - - - - - - The option services.snapserver.openFirewall - will no longer default to true starting - with NixOS 22.11. Enable it explicitly if you need to control - Snapserver remotely or connect streamig clients from other - hosts. - - - - - The option - networking.useDHCP - isn’t deprecated anymore. When using - systemd-networkd, - a generic .network-unit is added which - enables DHCP for each interface matching - en*, eth* or - wl* with priority 99 (which means that it - doesn’t have any effect if such an interface is matched by a - .network-unit with a lower priority). In - case of scripted networking, no behavior was changed. - - - - - The new - postgresqlTestHook - runs a PostgreSQL server for the duration of package checks. - - - - - zfs was updated from 2.1.4 to 2.1.5, - enabling it to be used with Linux kernel 5.18. - - - - - stdenv.mkDerivation now supports a - self-referencing finalAttrs: parameter - containing the final mkDerivation arguments - including overrides. drv.overrideAttrs now - supports two parameters - finalAttrs: previousAttrs:. This allows - packaging configuration to be overridden in a consistent - manner by providing an alternative to - rec {} syntax. - - - Additionally, passthru can now reference - finalAttrs.finalPackage containing the - final package, including attributes such as the output paths - and overrideAttrs. - - - New language integrations can be simplified by overriding a - prototype package containing the - language-specific logic. This removes the need for a extra - layer of overriding for the generic builder - arguments, thus removing a usability problem and source of - error. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml deleted file mode 100644 index 2d7226caa5b5..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ /dev/null @@ -1,1841 +0,0 @@ -
- Release 22.11 (“Raccoon”, 2022.11/30) - - The NixOS release team is happy to announce a new version of NixOS - 22.11. NixOS is a Linux distribution, whose set of packages can also - be used on other Linux systems and macOS. - - - This release is supported until the end of June 2023, handing over - to NixOS 23.05. - - - To upgrade to the latest release follow the - upgrade chapter. - -
- Highlights - - In addition to numerous new and upgraded packages, this release - includes the following highlights: - - - - - Software that uses the crypt password - hashing API is now using the implementation provided by - libxcrypt - instead of glibc’s, which enables support for more secure - algorithms. - - - - - Support for algorithms that libxcrypt - does - not consider strong are - deprecated as of this - release, and will be removed in NixOS 23.05. - - - - - This includes system login passwords. Given this, we - strongly encourage all - users to update their system passwords, as you will be - unable to login if password hashes are not migrated by the - time their support is removed. - - - - - When using - users.users.<name>.hashedPassword - to configure user passwords, run - mkpasswd, and use the yescrypt hash - that is provided as the new value. - - - - - On the other hand, for interactively configured user - passwords, simply re-set the passwords for all users - with passwd. - - - - - This release introduces warnings for the use of - deprecated hash algorithms for both methods of - configuring passwords. To make sure you migrated - correctly, run - nixos-rebuild switch. - - - - - - - - - The NixOS documentation is now generated from markdown. While - docbook is still part of the documentation build process, it’s - a big step towards the full migration. - - - - - aarch64-linux is now included in the - nixos-22.11 and - nixos-22.11-small channels. This means that - when those channel update, both - x86_64-linux and - aarch64-linux will be available in the - binary cache. - - - - - aarch64-linux ISOs are now available on the - downloads - page. - - - - - nsncd is now available as a replacement of - nscd. - - - nscd is responsible for resolving - hostnames, users and more in NixOS and has been a long - standing source of bugs, such as sporadic network freezes. - - - More context in this - issue. - - - Help us test the new implementation by setting - services.nscd.enableNsncd to - true. - - - We plan to use nsncd by default in NixOS - 23.05. - - - - - Linode cloud images are now supported by importing - ${modulesPath}/virtualisation/linode-image.nix - and accessing system.build.linodeImage on - the output. - - - - - hardware.nvidia has a new option, - hardware.nvidia.open, that can be used to - enable the usage of NVIDIA’s open-source kernel driver. Note - that the driver’s support for GeForce and Workstation GPUs is - still alpha quality, see - the - release announcement for more information. - - - - - The emacs package now makes use of native - compilation which means: - - - - - Emacs packages from Nixpkgs, builtin or not, will do - native compilation ahead of time so you can enjoy the - benefit of native compilation without compiling them on - you machine; - - - - - Emacs packages from somewhere else, e.g. - package-install, will perform - asynchronously deferred native compilation. If you do not - want this, maybe to avoid CPU consumption for compilation, - you can use - (setq native-comp-deferred-compilation nil) - to disable it while still benefiting from native - compilation for packages from Nixpkgs. - - - - - -
-
- Internal changes - - - - Haskell ghcWithPackages is now up to 15 - times faster to evaluate, thanks to changing - lib.closePropagation from a quadratic to - linear complexity. Please see backward incompatibilities notes - below. - https://github.com/NixOS/nixpkgs/pull/194391 - - - - - For cross-compilation targets that can also run on the - building machine, we now run tests. This, for example, is the - case for the pkgsStatic and - pkgsLLVM package sets or i686 packages on - x86_64 machines. - - - - - To simplify cross-compilation in NixOS, this release - introduces the nixpkgs.hostPlatform and - nixpkgs.buildPlatform options. These cover - and override the - nixpkgs.{system,localSystem,crossSystem} - options. - - - - - hostPlatform is the platform or - system string of the - NixOS system described by the configuration. - - - - - buildPlatform is the platform that is - responsible for building the NixOS configuration. It - defaults to the hostPlatform, for a - non-cross build configuration. To cross compile, set - buildPlatform to a different value. - - - - - The new options convey the same information, but with fewer - options, and following the Nixpkgs terminology. - - - The existing options - nixpkgs.{system,localSystem,crossSystem} - have not been formally deprecated, to allow for evaluation of - the change and to allow for a transition period so that in - time the ecosystem can switch without breaking compatibility - with any supported NixOS release. - - - -
-
- Notable version updates - - - - Nix has been upgraded from v2.8.1 to v2.11.0. For more - information, please see the release notes for - 2.9, - 2.10 - and - 2.11. - - - - - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. - - - - - GNOME has been upgraded to version 43. Please see the - release - notes for details. - - - - - KDE Plasma has been upgraded from v5.24 to v5.26. Please see - the release notes for - v5.25 - and - v5.26 - for more details on the included changes. - - - - - Cinnamon has been updated to 5.4, and the Cinnamon module now - defaults to Blueman as the Bluetooth manager and slick-greeter - as the LightDM greeter, to match upstream. - - - - - PHP now defaults to PHP 8.1, updated from 8.0. - - - - - Perl has been updated to 5.36, and its core module - HTTP::Tiny was patched to verify SSL/TLS - certificates by default. - - - - - Python now defaults to 3.10, updated from 3.9. - - - -
-
- Backward Incompatibilities - - - - Nixpkgs now requires Nix 2.3 or newer. - - - - - The isCompatible predicate checking CPU - compatibility is no longer exposed by the platform sets - generated using lib.systems.elaborate. In - most cases you will want to use the new - canExecute predicate instead which also - takes the kernel / syscall interface into account. - lib.systems.parse.isCompatible still - exists, but has changed semantically: Architectures with - differing endianness modes are no longer considered - compatible. - - - - - ngrok has been upgraded from 2.3.40 to - 3.0.4. Please see - the - upgrade guide and - changelog. - Notably, breaking changes are that the config file format has - changed and support for single hyphen arguments was dropped. - - - - - i18n.supportedLocales is now only generated - with the locales set in i18n.defaultLocale - and i18n.extraLocaleSettings. - - - - - This reduces the final system closure size by up to 200MB. - - - - - If you require all locales installed, set the option to - [ "all" ]. - - - - - - - Deprecated settings logrotate.paths and - logrotate.extraConfig have been removed. - Please convert any uses to - services.logrotate.settings - instead. - - - - - The isPowerPC predicate, found on - platform attrsets - (hostPlatform, - buildPlatform, - targetPlatform, etc) has been removed in - order to reduce confusion. The predicate was was defined such - that it matches only the 32-bit big-endian members of the - POWER/PowerPC family, despite having a name which would imply - a broader set of systems. If you were using this predicate, - you can replace foo.isPowerPC with - (with foo; isPower && is32bit && isBigEndian). - - - - - The fetchgit fetcher now uses - cone - mode by default for sparse checkouts. - Non-cone - mode can be enabled by passing - nonConeMode = true, but note that non-cone - mode is deprecated and this option may be removed alongside a - future Git update without notice. - - - - - The fetchgit fetcher supports sparse - checkouts via the sparseCheckout option. - This used to accept a multi-line string with - directories/patterns to check out, but now requires a list of - strings. - - - - - openssh was updated to version 9.1, - disabling the generation of DSA keys when using - ssh-keygen -A as they are insecure. Also, - SetEnv directives in - ssh_config and - sshd_config are now first-match-wins. - - - - - bsp-layout no longer uses the command - cycle to switch to other window layouts, as - it got replaced by the commands previous - and next. - - - - - The Barco ClickShare driver/client package - pkgs.clickshare-csc1 and the option - programs.clickshare-csc1.enable have been - removed, as it requires qt4, which reached - its end-of-life 2015 and will no longer be supported by - nixpkgs. - According - to Barco many of their base unit models can be used - with Google Chrome and the Google Cast extension. - - - - - services.hbase has been renamed to - services.hbase-standalone. For production - HBase clusters, use services.hadoop.hbase - instead. - - - - - The p4 package now only includes the - open-source Perforce Helix Core command-line client and APIs. - It no longer installs the unfree Helix Core Server binaries - p4d, p4broker, and - p4p. To install the Helix Core Server - binaries, use the p4d package instead. - - - - - The OpenSSL extension for the PHP interpreter used by - Nextcloud is built against OpenSSL 1.1 if - is below - 22.11. This is to make sure that people - using - server-side - encryption don’t lose access to their files. - - - In any other case, it’s safe to use OpenSSL 3 for PHP’s - OpenSSL extension. This can be done by setting - - to false. - - - - - The coq package and versioned variants - starting at coq_8_14 no longer include - CoqIDE, which is now available through - coqPackages.coqide. It is still possible to - get CoqIDE as part of the coq package by - overriding the buildIde argument of the - derivation. - - - - - PHP 7.4 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 22.11 release. - - - - - The ipfs package and module were renamed to kubo. The kubo - module now uses an RFC42-style settings - option instead of extraConfig and the - gatewayAddress, - apiAddress and - swarmAddress options were renamed. Using - the old names will print a warning but still work. - - - - - pkgs.cosign does not provide the - cosigned binary anymore. The - sget binary has been moved into its own - package. - - - - - Emacs now uses the Lucid toolkit by default instead of GTK - because of stability and compatibility issues. Users who still - wish to remain using GTK can do so by using - emacs-gtk. - - - - - kanidm has been updated to 1.1.0-alpha.10 - and now requires a TLS certificate and key. It will always - start https and-–-if enabled-–-an LDAPS - server and no HTTP and LDAP server anymore. - - - - - riak package removed along with - services.riak module, due to lack of - maintainer to update the package. - - - - - ppd files in pkgs.cups-drv-rastertosag-gdi - are now gzipped. If you refer to such a ppd file with its path - (e.g. via - hardware.printers.ensurePrinters) - you will need to append .gz to the path. - - - - - xow package removed along with the - hardware.xow module, due to the project - being deprecated in favor of xone, which is - available via the hardware.xone module. - - - - - dd-agent package removed along with the - services.dd-agent module, due to the - project being deprecated in favor of - datadog-agent, which is available via the - services.datadog-agent module. - - - - - teleport has been upgraded to major version - 10. Please see upstream - upgrade - instructions and - release - notes. - - - - - lib.closePropagation now needs that all - gathered sets have an outPath attribute. - - - - - lemmy module option - services.lemmy.settings.database.createLocally - moved to - services.lemmy.database.createLocally. - - - - - virtlyst package and services.virtlyst - module removed, due to lack of maintainers. - - - - - The nix.checkConfig option now fully - disables the config check. The new - nix.checkAllErrors option behaves like - nix.checkConfig previously did. - - - - - generateOptparseApplicativeCompletions and - generateOptparseApplicativeCompletion from - haskell.lib.compose (and - haskell.lib) have been deprecated in favor - of generateOptparseApplicativeCompletions - (plural!) as provided by the haskell package sets (so - haskellPackages.generateOptparseApplicativeCompletions - etc.). The latter allows for cross-compilation (by - automatically disabling generation of completion in the cross - case). For it to work properly you need to make sure that the - function comes from the same context as the package you are - trying to override, i.e. always use the same package set as - your package is coming from or – even better – use - self.generateOptparseApplicativeCompletions - if you are overriding a haskell package set. The old functions - are retained for backwards compatibility, but yield are - warning. - - - - - The services.graphite.api and - services.graphite.beacon NixOS options, and - the python3.pkgs.graphite_api, - python3.pkgs.graphite_beacon and - python3.pkgs.influxgraph packages, have - been removed due to lack of upstream maintenance. - - - - - The trace binary from - perf-linux package has been removed, due to - being a duplicate of the perf binary. - - - - - The aws package has been removed due to - being abandoned by the upstream. It is recommended to use - awscli or awscli2 - instead. - - - - - The - CEmu - TI-84 Plus CE emulator package has been renamed to - cemu-ti. The - Cemu Wii U - emulator is now packaged as cemu. - - - - - systemd-networkd v250 deprecated, renamed, - and moved some sections and settings which leads to the - following breaking module changes: - - - - - systemd.network.networks.<name>.dhcpV6PrefixDelegationConfig - is renamed to - systemd.network.networks.<name>.dhcpPrefixDelegationConfig. - - - - - systemd.network.networks.<name>.dhcpV6Config - no longer accepts the - ForceDHCPv6PDOtherInformation= setting. - Please use the WithoutRA= and - UseDelegatedPrefix= settings in your - systemd.network.networks.<name>.dhcpV6Config - and the DHCPv6Client= setting in your - systemd.network.networks.<name>.ipv6AcceptRAConfig - to control when the DHCPv6 client is started and how the - delegated prefixes are handled by the DHCPv6 client. - - - - - systemd.network.networks.<name>.networkConfig - no longer accepts the IPv6Token= - setting. Use the Token= setting in your - systemd.network.networks.<name>.ipv6AcceptRAConfig - instead. The - systemd.network.networks.<name>.ipv6Prefixes.*.ipv6PrefixConfig - now also accepts the Token= setting. - - - - - - - arangodb versions 3.3, 3.4, and 3.5 have - been removed because they are at EOL upstream. The default is - now 3.10.0. Support for aarch64-linux has been removed since - the target cannot be built reproducibly. By default - arangodb is now built for the - haswell architecture. If you wish to build - for a different architecture, you may override the - targetArchitecture argument with a value - from - this - list supported upstream. Some architecture specific - optimizations are also conditionally enabled. You may alter - this behavior by overriding the - asmOptimizations parameter. You may also - add additional architecture support by adding more - -DHAS_XYZ flags to - cmakeFlags via - overrideAttrs. - - - - - The meta.mainProgram attribute of packages - in wineWowPackages now defaults to - "wine64". - - - - - The paperless module now defaults - PAPERLESS_TIME_ZONE to your configured - system timezone. - - - - - The top-level termonad-with-packages alias - for termonad has been removed. - - - - - Linux 4.9 has been removed because it will reach its end of - life within the lifespan of 22.11. - - - - - (Neo)Vim can not be configured with - configure.pathogen anymore to reduce - maintainance burden. Use configure.packages - instead. - - - - - Neovim can not be configured with plug anymore (still works - for vim). - - - - - The adguardhome module no longer uses - host and port options, - use settings.bind_host and - settings.bind_port instead. - - - - - The default kops version is now 1.25.1 and - support for 1.22 and older has been dropped. - - - - - The zrepl package has been updated from - 0.5.0 to 0.6.0. See the - changelog - for details. - - - - - k3s no longer supports Docker as runtime - due to upstream dropping support. - - - - - cassandra_2_1 and - cassandra_2_2 have been removed. Please - update to cassandra_3_11 or - cassandra_3_0. See the - changelog - for more information about the upgrade process. - - - - - mysql57 has been removed. Please update to - mysql80 or mariadb. See - the - upgrade - guide for more information. - - - - - Consequently, cqrlog and - amorok now use mariadb - instead of mysql57 for their embedded - databases. Running mysql_upgrade may be - neccesary. - - - - - k3s supports clusterInit - option, and it is enabled by default, for servers. - - - - - percona-server56 has been removed. Please - migrate to mysql or - mariadb if possible. - - - - - obs-studio hase been updated to version 28. - If you have packaged custom plugins, check if they are - compatible. obs-websocket has been - integrated into obs-studio. - - - - - signald has been bumped to - 0.23.0. For the upgrade, a migration - process is necessary. It can be done by running a command like - this before starting signald.service: - - -signald -d /var/lib/signald/db \ - --database sqlite:/var/lib/signald/db \ - --migrate-data - - - For further information, please read the upstream changelogs. - - - - - stylua no longer accepts - lua52Support and - luauSupport overrides. Use - features instead, which defaults to - [ "lua54" "luau" ]. - - - - - ocamlPackages.ocaml_extlib has been renamed - to ocamlPackages.extlib. - - - - - pkgs.fetchNextcloudApp has been rewritten - to circumvent impurities in e.g. tarballs from GitHub and to - make it easier to apply patches. This means that your hashes - are out-of-date and the (previously required) attributes - name and version are no - longer accepted. - - - - - The Syncthing service now only allows absolute paths—starting - with / or ~/—for - services.syncthing.folders.<name>.path. - In a future release other paths will be allowed again and - interpreted relative to - services.syncthing.dataDir. - - - - - services.github-runner and - services.github-runners.<name> gained - the option serviceOverrides which allows - overriding the systemd serviceConfig. If - you have been overriding the systemd service configuration - (i.e., by defining - systemd.services.github-runner.serviceConfig), - you have to use the serviceOverrides option - now. Example: - - -services.github-runner.serviceOverrides.SupplementaryGroups = [ - "docker" -]; - - - -
-
- Other Notable Changes - - - - PHP is now built in NTS (Non-Thread Safe) - mode by default. - - - - - For Apache and mod_php usage, we enable - ZTS (Zend Thread Safe) mode. This has - been a common practice for a long time in other - distributions. - - - - - - - firefox, thunderbird and - librewolf now come with Wayland support by - default. The firefox-wayland, - firefox-esr-wayland, - thunderbird-wayland and - librewolf-wayland attributes are obsolete - and have been aliased to their generic attribute. - - - - - The xplr package has been updated from - 0.18.0 to 0.19.0, which brings some breaking changes. See the - upstream - release notes for more details. - - - - - Configuring multiple GitHub runners is now possible through - services.github-runners.<name>. The - options under services.github-runner - remain, to configure a single runner. - - - - - github-runner gained support for ephemeral - runners and registrations using a personal access token (PAT) - instead of a registration token. See - services.github-runner.ephemeral and - services.github-runner.tokenFile for - details. - - - - - A new module was added to provide hardware support for the - Saleae Logic device family, providing the options - hardware.saleae-logic.enable and - hardware.saleae-logic.package. - - - - - ZFS module will no longer allow hibernation by default. - - - - - This is a safety measure to prevent data loss cases like - the ones described at - OpenZFS/260 - and - OpenZFS/12842. - - - - - Use the boot.zfs.allowHibernation - option to configure this behaviour. - - - - - - - Mastodon now automatically removes remote media attachments - older than 30 days. This is configurable through - services.mastodon.mediaAutoRemove. - - - - - The Redis module now disables RDB persistence when - services.redis.servers.<name>.save = [] - instead of using the Redis default. - - - - - Neo4j was updated from version 3 to version 4. See upstream’s - migration - guide for information on how to migrate your instance. - - - - - The networking.wireguard module now can set - the mtu on interfaces and tag its packets with an fwmark. - - - - - The option overrideStrategy was added to - the different systemd unit options - (systemd.services.<name>, - systemd.sockets.<name>, …) to allow - enforcing the creation of a dropin file, rather than the main - unit file, by setting it to asDropin. This - is useful in cases where the existence of the main unit file - is not known to Nix at evaluation time, for example when the - main unit file is provided by adding a package to - systemd.packages. See the fix proposed in - NixOS’s - systemd abstraction doesn’t work with systemd template - units for an example. - - - - - The polymc package has been removed due to - a rogue maintainer. It has been replaced by - prismlauncher, a fork by the rest of the - maintainers. For more details, see - the - PR that made this change and - the - issue detailing the vulnerability. Users with existing - installations should rename - ~/.local/share/polymc to - ~/.local/share/PrismLauncher. The main - config file’s path has also moved from - ~/.local/share/polymc/polymc.cfg to - ~/.local/share/PrismLauncher/prismlauncher.cfg. - - - - - The bloat package has been updated from - unstable-2022-03-31 to unstable-2022-10-25, which brings a - breaking change. See - this - upstream commit message for details. - - - - - Synapse’s systemd unit has been hardened. - - - - - The module services.grafana was refactored - to be compliant with - RFC - 0042. To be precise, this means that the following - things have changed: - - - - - The newly introduced option - is an - attribute-set that will be converted into Grafana’s INI - format. This means that the configuration from - Grafana’s - configuration reference can be directly written as - attribute-set in Nix within this option. - - - - - The option - services.grafana.extraOptions has been - removed. This option was an association of environment - variables for Grafana. If you had an expression like - - -{ - services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; -} - - - your Grafana instance was running with - GF_SECURITY_ADMIN_USER=foobar in its - environment. - - - For the migration, it is recommended to turn it into the - INI format, i.e. to declare - - -{ - services.grafana.settings.security.admin_user = "foobar"; -} - - - instead. - - - The keys in - services.grafana.extraOptions have the - format - <INI section name>_<Key Name>. - Further details are outlined in the - configuration - reference. - - - Alternatively you can also set all your values from - extraOptions to - systemd.services.grafana.environment, - make sure you don’t forget to add the - GF_ prefix though! - - - - - Previously, the options - services.grafana.provision.datasources - and - services.grafana.provision.dashboards - expected lists of datasources or dashboards for the - declarative - provisioning. - - - To declare lists of - - - - - datasources, please - rename your declarations to - services.grafana.provision.datasources.settings.datasources. - - - - - dashboards, please - rename your declarations to - services.grafana.provision.dashboards.settings.providers. - - - - - This change was made to support more features for that: - - - - - It’s possible to declare the - apiVersion of your dashboards and - datasources by - services.grafana.provision.datasources.settings.apiVersion - (or - services.grafana.provision.dashboards.settings.apiVersion). - - - - - Instead of declaring datasources and dashboards in - pure Nix, it’s also possible to specify configuration - files (or directories) with YAML instead using - services.grafana.provision.datasources.path - (or - services.grafana.provision.dashboards.path. - This is useful when having provisioning files from - non-NixOS Grafana instances that you also want to - deploy to NixOS. - - - Note: secrets from - these files will be leaked into the store unless you - use a - file-provider - or env-var for secrets! - - - - - services.grafana.provision.notifiers - is not affected by this change because this feature is - deprecated by Grafana and will probably be removed in - Grafana 10. It’s recommended to use - services.grafana.provision.alerting.contactPoints - instead. - - - - - - - - - The services.grafana.provision.alerting - option was added. It includes suboptions for every - alerting-related objects (with the exception of - notifiers), which means it’s now possible - to configure modern Grafana alerting declaratively. - - - - - Synapse now requires entries in the - state_group_edges table to be unique, in - order to prevent accidentally introducing duplicate - information (for example, because a database backup was - restored multiple times). If your Synapse database already has - duplicate rows in this table, this could fail with an error - and require manual remediation. - - - - - The diamond package has been update from - 0.8.36 to 2.0.15. See the - upstream - release notes for more details. - - - - - The guake package has been updated from - 3.6.3 to 3.9.0, see the - changelog - for more details. - - - - - The netlify-cli package has been updated - from 6.13.2 to 12.2.4, see the - changelog - for more details. - - - - - dockerTools.buildImage’s - contents parameter has been deprecated in - favor of copyToRoot. Use - copyToRoot = buildEnv { ... }; or similar - if you intend to add packages to /bin. - - - - - The proxmox.qemuConf.bios option was added, - it corresponds to Hardware->BIOS field - in Proxmox web interface. Use - "ovmf" value to build UEFI image, - default value remains "bios". New - option proxmox.partitionTableType defaults - to either "legacy" or - "efi", depending on the - bios value. Setting - partitionTableType to - "hybrid" results in an image, - which supports both methods - ("bios" and - "ovmf"), thereby remaining - bootable after change to Proxmox - Hardware->BIOS field. - - - - - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. - It is now the upstream version from https://www.memtest.org/, - as coreboot’s fork is no longer available. - - - - - Option descriptions, examples, and defaults writing in DocBook - are now deprecated. Using CommonMark is preferred and will - become the default in a future release. - - - - - The - documentation.nixos.options.allowDocBook - option was added to ease the transition to CommonMark option - documentation. Setting this option to false - causes an error for every option included in the manual that - uses DocBook documentation; it defaults to - true to preserve the previous behavior and - will be removed once the transition to CommonMark is complete. - - - - - The Redis module now persists each instance’s configuration - file in the state directory, in order to support some more - advanced use cases like Sentinel. - - - - - protonup has been aliased to and replaced - by protonup-ng due to upstream not - maintaining it. - - - - - The udisks2 service, available at - services.udisks2.enable, is now disabled by - default. It will automatically be enabled through services and - desktop environments as needed. This also means that polkit - will now actually be disabled by default. The default for - security.polkit.enable was already flipped - in the previous release, but udisks2 being enabled by default - re-enabled it. - - - - - Nextcloud has been updated to version - 25. Additionally the - following things have changed for Nextcloud in NixOS: - - - - - For Nextcloud >=24, - the default PHP version is 8.1. - - - - - Nextcloud 23 has been - removed since it will reach its - end - of life in December 2022. - - - - - If system.stateVersion is - >=22.11, Nextcloud - 25 will be installed by default. For older versions, - Nextcloud 24 will be installed. - - - - - Please ensure that you only upgrade one major release at a - time! Nextcloud doesn’t support upgrades across multiple - versions, i.e. an upgrade from - 23 to - 25 is only possible - when upgrading to 24 - first. - - - - - - - systemd-oomd is enabled by default. Depending on which systemd - units have ManagedOOMSwap=kill or - ManagedOOMMemoryPressure=kill, systemd-oomd - will SIGKILL all the processes under the appropriate - descendant cgroups when the configured limits are exceeded. - NixOS does currently not configure cgroups with oomd by - default, this can be enabled using - systemd.oomd.enableRootSlice, - systemd.oomd.enableSystemSlice, - and - systemd.oomd.enableUserServices. - - - - - The tt-rss service performs two database - migrations when you first use its web UI after upgrade. - Consider backing up its database before updating. - - - - - The pass-secret-service package now - includes systemd units from upstream, so adding it to the - NixOS services.dbus.packages option will - make it start automatically as a systemd user service when an - application tries to talk to the libsecret D-Bus API. - - - - - The Wordpress module now has support for installing language - packs through a new option, - services.wordpress.sites.<site>.languages. - - - - - The default package for - services.mullvad-vpn.package was changed to - pkgs.mullvad, allowing cross-platform usage - of Mullvad. pkgs.mullvad only contains the - Mullvad CLI tool, so users who rely on the Mullvad GUI will - want to change it back to pkgs.mullvad-vpn, - or add pkgs.mullvad-vpn to their - environment. - - - - - PowerDNS has been updated from v4.6.2 to v4.7.2. Please be - sure to review the - Upgrade - Notes provided by upstream before upgrading. Worth - specifically noting is that the new Catalog Zones feature - comes with a mandatory schema change for the GSQL database - backends, which has to be manually applied. - - - - - There is a new module for the thunar - program (the Xfce file manager), which depends on the - xfconf dbus service, and also has a dbus - service and a systemd unit. The option - services.xserver.desktopManager.xfce.thunarPlugins - has been renamed to - programs.thunar.plugins, and may be removed - in a future release. - - - - - There is a new module for xfconf (the Xfce - configuration storage system), which has a dbus service. - - - - - The Mastodon package has been upgraded to v4.0.0. See the - v4.0.0 - release notes for a list of changes. On standard - setups, no manual migration steps are required. Nevertheless, - a database backup is recommended. - - - - - The nomad package now defaults to v1.3, - which no longer has a downgrade path to v1.2 or older. - - - - - The nodePackages package set now defaults - to the LTS release in the nodejs package - again, instead of being pinned to - nodejs-14_x. Several updates to node2nix - have been made for compatibility with newer Node.js and npm - versions and a new postRebuild hook has - been added for packages to perform extra build steps before - the npm install step prunes dev dependencies. - - - - - boot.kernel.sysctl is defined as a - freeformType and adds a custom merge option for - net.core.rmem_max (taking the highest value - defined to avoid conflicts between 2 services trying to set - that value). - - - - - The mame package does not ship with its - tools anymore in the default output. They were moved to a - separate tools output instead. For - convenience, mame-tools package was added - for those who want to use it. - - - - - A NixOS module for Firefox has been added which allows - preferences and - policies - to be set. This also allows extensions to be installed via the - ExtensionSettings policy. The new options - are under programs.firefox. - - - - - The option - services.picom.experimentalBackends was - removed since it is now the default and the option will cause - picom to quit instead. - - - - - haskellPackages.callHackage is not always - invalidated if all-cabal-hashes changes, - leading to less rebuilds of haskell dependencies. - - - - - haskellPackages.callHackage and - haskellPackages.callCabal2nix (and related - functions) no longer keep a reference to the - cabal2nix call used to generate them. As a - result, they will be garbage collected more often. - - - -
-
- New Services - - - - alps, - a simple and extensible webmail. Available as - services.alps. - - - - - appvm, - Nix based app VMs. Available as - virtualisation.appvm. - - - - - AusweisApp2, - the authentication software for the German ID card. Available - as - programs.ausweisapp. - - - - - automatic-timezoned. - a Linux daemon to automatically update the system timezone - based on location. Available as - services.automatic-timezoned. - - - - - Dolibarr, - an enterprise resource planning and customer relationship - manager. Enable using - services.dolibarr. - - - - - dragonflydb, - a modern replacement for Redis and Memcached. Available as - services.dragonflydb. - - - - - endlessh-go, - an SSH tarpit that exposes Prometheus metrics. Available as - services.endlessh-go. - - - - - endlessh, - an SSH tarpit. Available as - services.endlessh. - - - - - EVCC is an EV charge - controller with PV integration. It supports a multitude of - chargers, meters, vehicle APIs and more and ties that together - with a well-tested backend and a lightweight web frontend. - Available as - services.evcc. - - - - - expressvpn, - the CLI client for ExpressVPN. Available as - services.expressvpn. - - - - - FreshRSS, a - free, self-hostable RSS feed aggregator. Available as - services.freshrss. - - - - - Garage, - a simple object storage server for geodistributed deployments, - alternative to MinIO. Available as - services.garage. - - - - - go-autoconfig, - IMAP/SMTP autodiscover server. Available as - services.go-autoconfig. - - - - - Grafana - Tempo, a distributed tracing store. Available as - services.tempo. - - - - - HBase - cluster, a distributed, scalable, big data store. - Available as - services.hadoop.hbase. - - - - - infnoise, - a hardware True Random Number Generator dongle. Available as - services.infnoise. - - - - - kanata, - a tool to improve keyboard comfort and usability with advanced - customization. Available as - services.kanata. - - - - - karma, - an alert dashboard for Prometheus Alertmanager. Available as - services.karma - - - - - Komga, a free and - open source comics/mangas media server. Available as - services.komga. - - - - - kthxbye, - an alert acknowledgement management daemon for Prometheus - Alertmanager. Available as - services.kthxbye - - - - - languagetool, - a multilingual grammar, style, and spell checker. Available as - services.languagetool. - - - - - Listmonk, a - self-hosted newsletter manager. Enable using - services.listmonk. - - - - - Mepo, a - fast, simple, hackable OSM map viewer for mobile and desktop - Linux. Available as - programs.mepo.enable. - - - - - merecat, - a small and easy HTTP server based on thttpd. Available as - services.merecat - - - - - netbird, a zero - configuration VPN. Available as - services.netbird. - - - - - ntfy.sh, a push - notification service. Available as - services.ntfy-sh - - - - - OpenRGB, - a FOSS tool for controlling RGB lighting. Available as - services.hardware.openrgb.enable. - - - - - Outline, - a wiki and knowledge base similar to Notion. Available as - services.outline. - - - - - Patroni, - a template for PostgreSQL HA with ZooKeeper, etcd or Consul. - Available as - services.patroni. - - - - - persistent-evdev, - a daemon to add virtual proxy devices that mirror a physical - input device but persist even if the underlying hardware is - hot-plugged. Available as - services.persistent-evdev. - - - - - Please, - a Sudo clone written in Rust. Available as - security.please. - - - - - Prometheus - IPMI exporter, an IPMI exporter for Prometheus. - Available as - services.prometheus.exporters.ipmi. - - - - - Sachet, - an SMS alerting tool for the Prometheus Alertmanager. - Available as - services.prometheus.sachet. - - - - - schleuder, a - mailing list manager with PGP support. Enable using - services.schleuder. - - - - - syncstorage-rs, - a self-hostable sync server for Firefox. Available as - services.firefox-syncserver. - - - - - Tandoor Recipes, - a self-hosted multi-tenant recipe collection. Available as - services.tandoor-recipes. - - - - - TAYGA, - an out-of-kernel stateless NAT64 implementation. Available as - services.tayga. - - - - - tmate-ssh-server, - server side part of - tmate. Available - as - services.tmate-ssh-server. - - - - - Uptime - Kuma, a fancy self-hosted monitoring tool. Available as - services.uptime-kuma. - - - - - WriteFreely, - a simple blogging platform with ActivityPub support. Available - as - services.writefreely. - - - - - xray, - a fully compatible v2ray-core replacement. Features XTLS, - which when enabled on server and client, brings UDP FullCone - NAT to proxy setups. Available as - services.xray. - - - -
-
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml deleted file mode 100644 index 1ae5fede272b..000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ /dev/null @@ -1,877 +0,0 @@ -
- Release 23.05 (“Stoat”, 2023.05/??) - - Support is planned until the end of December 2023, handing over to - 23.11. - -
- Highlights - - In addition to numerous new and upgraded packages, this release - has the following highlights: - - - - - Cinnamon has been updated to 5.6, see - the - pull request for what is changed. - - - - - nixos-rebuild now supports an extra - --specialisation option that can be used to - change specialisation for switch and - test commands. - - - -
-
- New Services - - - - Akkoma, an - ActivityPub microblogging server. Available as - services.akkoma. - - - - - blesh, - a line editor written in pure bash. Available as - programs.bash.blesh. - - - - - webhook, - a lightweight webhook server. Available as - services.webhook. - - - - - cups-pdf-to-pdf, - a pdf-generating cups backend based on - cups-pdf. - Available as - services.printing.cups-pdf. - - - - - Cloudlog, - a web-based Amateur Radio logging application. Available as - services.cloudlog. - - - - - fzf, - a command line fuzzyfinder. Available as - programs.fzf. - - - - - gmediarender, - a simple, headless UPnP/DLNA renderer. Available as - services.gmediarender. - - - - - stevenblack-blocklist, - A unified hosts file with base extensions for blocking - unwanted websites. Available as - networking.stevenblack. - - - - - goeland, - an alternative to rss2email written in golang with many - filters. Available as - services.goeland. - - - - - atuin, - a sync server for shell history. Available as - services.atuin. - - - - - mmsd, - a lower level daemon that transmits and recieves MMSes. - Available as - services.mmsd. - - - - - QDMR, a - gui application and command line tool for programming cheap - DMR radios - programs.qdmr - - - - - v2rayA, a Linux - web GUI client of Project V which supports V2Ray, Xray, SS, - SSR, Trojan and Pingtunnel. Available as - services.v2raya. - - - - - ulogd, - a userspace logging daemon for netfilter/iptables related - logging. Available as - services.ulogd. - - - - - photoprism, - a AI-Powered Photos App for the Decentralized Web. Available - as - services.photoprism. - - - - - autosuspend, - a python daemon that suspends a system if certain conditions - are met, or not met. - - - -
-
- Backward Incompatibilities - - - - carnix and cratesIO has - been removed due to being unmaintained, use alternatives such - as - naersk - and - 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, 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.<name>.inhibitsSleep. - - - - - podman now uses the - netavark network stack. Users will need to - delete all of their local containers, images, volumes, etc, by - running podman system reset --force once - before upgrading their systems. - - - - - git-bug has been updated to at least - version 0.8.0, which includes backwards incompatible changes. - The git-bug-migration package can be used - to upgrade existing repositories. - - - - - The services.kubo.settings option is now no - longer stateful. If you changed any of the options in - services.kubo.settings in the past and then - removed them from your NixOS configuration again, those - changes are still in your Kubo configuration file but will now - be reset to the default. If you’re unsure, you may want to - make a backup of your configuration file (probably - /var/lib/ipfs/config) and compare after the update. - - - - - The EC2 image module no longer fetches instance metadata in - stage-1. This results in a significantly smaller initramfs, - since network drivers no longer need to be included, and - faster boots, since metadata fetching can happen in parallel - with startup of other services. This breaks services which - rely on metadata being present by the time stage-2 is entered. - Anything which reads EC2 metadata from - /etc/ec2-metadata should now have an - after dependency on - fetch-ec2-metadata.service - - - - - minio removed support for its legacy - filesystem backend in - RELEASE.2022-10-29T06-21-33Z. - This means if your storage was created with the old format, - minio will no longer start. Unfortunately minio doesn’t - provide a an automatic migration, they only provide - instructions - how to manually convert the node. To facilitate this - migration we keep around the last version that still supports - the old filesystem backend as - minio_legacy_fs. Use it via - services.minio.package = minio_legacy_fs; - to export your data before switching to the new version. See - the corresponding - issue - for more details. - - - - - services.sourcehut.dispatch and the - corresponding package - (sourcehut.dispatchsrht) have been removed - due to - upstream - deprecation. - - - - - The - services.snapserver.openFirewall - module option default value has been changed from - true to false. You will - need to explicitly set this option to true, - or configure your firewall. - - - - - The - services.tmate-ssh-server.openFirewall - module option default value has been changed from - true to false. You will - need to explicitly set this option to true, - or configure your firewall. - - - - - The - services.unifi-video.openFirewall - module option default value has been changed from - true to false. You will - need to explicitly set this option to true, - or configure your firewall. - - - - - Kime has been updated from 2.5.6 to 3.0.2 and the - i18n.inputMethod.kime.config option has - been removed. Users should use - daemonModules, - iconColor, and - extraConfig options under - i18n.inputMethod.kime instead. - - - - - tut has been updated from 1.0.34 to 2.0.0, - and now uses the TOML format for the configuration file - instead of INI. Additional information can be found - here. - - - - - The wordpress derivation no longer contains - any builtin plugins or themes. If you need them you have to - add them back to prevent your site from breaking. You can find - them in wordpressPackages.{plugins,themes}. - - - - - llvmPackages_rocm.llvm will not contain - clang or compiler-rt. - llvmPackages_rocm.clang will not contain - llvm. - llvmPackages_rocm.clangNoCompilerRt has - been removed in favor of using - llvmPackages_rocm.clang-unwrapped. - - - - - The EC2 image module previously detected and automatically - mounted ext3-formatted instance store devices and partitions - in stage-1 (initramfs), storing /tmp on the - first discovered device. This behaviour, which only catered to - very specific use cases and could not be disabled, has been - removed. Users relying on this should provide their own - implementation, and probably use ext4 and perform the mount in - stage-2. - - - - - teleport has been upgraded to major version - 11. Please see upstream - upgrade - instructions and - release - notes. - - - - - The EC2 image module previously detected and activated - swap-formatted instance store devices and partitions in - stage-1 (initramfs). This behaviour has been removed. Users - relying on this should provide their own implementation. - - - - - Calling makeSetupHook without passing a - name argument is deprecated. - - - - - Qt 5.12 and 5.14 have been removed, as the corresponding - branches have been EOL upstream for a long time. This affected - under 10 packages in nixpkgs, largely unmaintained upstream as - well, however, out-of-tree package expressions may need to be - updated manually. - - - - - The - services.wordpress.sites.<name>.plugins - and - 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. - - - - - 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. - - - - - The nix.readOnlyStore option has been - renamed to boot.readOnlyNixStore to clarify - that it configures the NixOS boot process, not the Nix daemon. - - - - - Deprecated xlibsWrapper transitional - package has been removed in favour of direct use of its - constitutents: xorg.libX11, - freetype and others. - - - - - .NET 5.0 was removed due to being end-of-life, use a newer, - supported .NET version - - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core - - - - - The iputils package, which is installed by default, no longer - provides the ninfod, - rarpd and rdisc tools. - See - upstream’s - release notes for more details and available - replacements. - - - -
-
- Other Notable Changes - - - - vim_configurable has been renamed to - vim-full to avoid confusion: - vim-full’s build-time features are - configurable, but both vim and - vim-full are - customizable (in the sense of user - configuration, like vimrc). - - - - - The module for the application firewall - opensnitch got the ability to configure - rules. Available as - services.opensnitch.rules - - - - - 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 - - - - - 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. - - - - - 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. - - - - - DocBook option documentation, which has been deprecated since - 22.11, will now cause a warning when documentation is built. - Out-of-tree modules should migrate to using CommonMark - documentation as outlined in - to silence this - warning. - - - DocBook option documentation support will be removed in the - next release and CommonMark will become the default. DocBook - option documentation that has not been migrated until then - will no longer render properly or cause errors. - - - - - NixOS now defaults to using nsncd (a non-caching - reimplementation in Rust) as NSS lookup dispatcher, instead of - the buggy and deprecated glibc-provided nscd. If you need to - switch back, set - services.nscd.enableNsncd = false, but - please open an issue in nixpkgs so your issue can be fixed. - - - - - The dnsmasq service now takes configuration - via the services.dnsmasq.settings attribute - set. The option - services.dnsmasq.extraConfig will be - deprecated when NixOS 22.11 reaches end of life. - - - - - The dokuwiki service now takes - configuration via the - services.dokuwiki.sites.<name>.settings - attribute set, extraConfig is deprecated - and will be removed. The - {aclUse,superUser,disableActions} - attributes have been renamed, pluginsConfig - now also accepts an attribute set of booleans, passing plain - PHP is deprecated. Same applies to acl - which now also accepts structured settings. - - - - - The wordpress service now takes - configuration via the - services.wordpress.sites.<name>.settings - attribute set, extraConfig is still - available to append additional text to - wp-config.php. - - - - - To reduce closure size in - nixos/modules/profiles/minimal.nix profile - disabled installation documentations and manuals. Also - disabled logrotate and - udisks2 services. - - - - - The minimal ISO image now uses the - nixos/modules/profiles/minimal.nix profile. - - - - - The ghcWithPackages and - ghcWithHoogle wrappers will now also - symlink GHC’s and all included libraries’ documentation to - $out/share/doc for convenience. If - undesired, the old behavior can be restored by overriding the - builders with - { installDocumentation = false; }. - - - - - mastodon now supports connection to a - remote PostgreSQL database. - - - - - services.peertube now requires you to - specify the secret file - secrets.secretsFile. It can be generated by - running openssl rand -hex 32. Before - upgrading, read the release notes for PeerTube: - - - - - Release - v5.0.0 - - - - - And backup your data. - - - - - services.chronyd is now started with - additional systemd sandbox/hardening options for better - security. - - - - - services.dhcpcd service now don’t solicit - or accept IPv6 Router Advertisements on interfaces that use - static IPv6 addresses. - - - - - The module services.headscale was - refactored to be compliant with - RFC - 0042. To be precise, this means that the following - things have changed: - - - - - Most settings has been migrated under - services.headscale.settings - which is an attribute-set that will be converted into - headscale’s YAML config format. This means that the - configuration from - headscale’s - example configuration can be directly written as - attribute-set in Nix within this option. - - - - - - - nixos/lib/make-disk-image.nix can now - mutate EFI variables, run user-provided EFI firmware or - variable templates. This is now extensively documented in the - NixOS manual. - - - - - 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 for migration instructions. - - - - - A new virtualisation.rosetta module was - added to allow running x86_64 binaries - through - Rosetta - inside virtualised NixOS guests on Apple silicon. This feature - works by default with the - UTM - virtualisation - package. - - - - - The new option users.motdFile allows - configuring a Message Of The Day that can be updated - dynamically. - - - - - The root package is now built with the - "-Dgnuinstall=ON" CMake flag, - making the output conform the bin - lib share layout. In - this layout, tutorials is under - share/doc/ROOT/; cmake, - font, icons, - js and macro under - share/root; - Makefile.comp and - Makefile.config under - etc/root. - - - - - Enabling global redirect in - services.nginx.virtualHosts now allows one - to add exceptions with the locations - option. - - - - - A new option recommendedBrotliSettings has - been added to services.nginx. Learn more - about compression in Brotli format - here. - - - - - Updated recommended settings in - services.nginx.recommendedGzipSettings: - - - - - Enables gzip compression for only certain proxied - requests. - - - - - Allow checking and loading of precompressed files. - - - - - Updated gzip mime-types. - - - - - Increased the minimum length of a response that will be - gzipped. - - - - - - - Garage - version is based on - 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 and force - services.garage.package - or upgrade accordingly - system.stateVersion. - - - - - hip has been separated into - hip, hip-common and - hipcc. - - - - - services.nginx.recommendedProxySettings now - removes the Connection header preventing - clients from closing backend connections. - - - - - Resilio sync secret keys can now be provided using a secrets - file at runtime, preventing these secrets from ending up in - the Nix store. - - - - - The firewall and nat - module now has a nftables based implementation. Enable - networking.nftables to use it. - - - - - The services.fwupd module now allows - arbitrary daemon settings to be configured in a structured - manner - (services.fwupd.daemonSettings). - - - - - 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 - can now access AX.25 interfaces via the - libax25 package. - - - - - 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. - - - -
-
diff --git a/nixos/doc/manual/installation/installation.md b/nixos/doc/manual/installation/installation.md new file mode 100644 index 000000000000..140594256609 --- /dev/null +++ b/nixos/doc/manual/installation/installation.md @@ -0,0 +1,11 @@ +# Installation {#ch-installation} + +This section describes how to obtain, install, and configure NixOS for first-time use. + +```{=include=} chapters +obtaining.chapter.md +installing.chapter.md +changing-config.chapter.md +upgrading.chapter.md +building-nixos.chapter.md +``` diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml deleted file mode 100644 index ba07d71d0ca3..000000000000 --- a/nixos/doc/manual/installation/installation.xml +++ /dev/null @@ -1,18 +0,0 @@ - - Installation - - - This section describes how to obtain, install, and configure NixOS for - first-time use. - - - - - - - - diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index ac7cf5a7bfc5..cf783c2d22b6 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -15,16 +15,16 @@ To begin the installation, you have to boot your computer from the install drive ::: {.note} The key to open the boot menu is different across computer brands and even - models. It can be F12, but also F1, - F9, F10, Enter, Del, - Esc or another function key. If you are unsure and don't see + models. It can be [F12]{.keycap}, but also [F1]{.keycap}, + [F9]{.keycap}, [F10]{.keycap}, [Enter]{.keycap}, [Del]{.keycap}, + [Esc]{.keycap} or another function key. If you are unsure and don't see it on the early boot screen, you can search online for your computers brand, model followed by "boot from usb". The computer might not even have that feature, so you have to go into the BIOS/UEFI settings to change the boot order. Again, search online for details about your specific computer model. - For Apple computers with Intel processors press and hold the ⌥ + For Apple computers with Intel processors press and hold the [⌥]{.keycap} (Option or Alt) key until you see the boot menu. On Apple silicon press and hold the power button. ::: @@ -41,7 +41,7 @@ To begin the installation, you have to boot your computer from the install drive 3. Shortly after selecting the appropriate boot drive, you should be presented with a menu with different installer options. Leave the default - and wait (or press Enter to speed up). + and wait (or press [Enter]{.keycap} to speed up). 4. The graphical images will start their corresponding desktop environment and the graphical installer, which can take some time. The minimal images @@ -421,7 +421,7 @@ Use the following commands: specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot. - : If there are other operating systems running on the machine before + If there are other operating systems running on the machine before installing NixOS, the [](#opt-boot.loader.grub.useOSProber) option can be set to `true` to automatically add them to the grub menu. @@ -438,10 +438,10 @@ Use the following commands: [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable) as well. - : If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and + If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and [](#opt-boot.loader.grub.efiSupport) to `true`. - : With system-boot, you should not need any special configuration to detect + With system-boot, you should not need any special configuration to detect other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber) to `true`, but this will only detect windows partitions, not other linux distributions. If you dual boot another linux distribution, use system-boot @@ -538,9 +538,7 @@ drive (here `/dev/sda`). [Example: NixOS Configuration](#ex-config) shows a corresponding configuration Nix expression. ::: {#ex-partition-scheme-MBR .example} -::: {.title} **Example: Example partition schemes for NixOS on `/dev/sda` (MBR)** -::: ```ShellSession # parted /dev/sda -- mklabel msdos # parted /dev/sda -- mkpart primary 1MB -8GB @@ -549,9 +547,7 @@ corresponding configuration Nix expression. ::: ::: {#ex-partition-scheme-UEFI .example} -::: {.title} **Example: Example partition schemes for NixOS on `/dev/sda` (UEFI)** -::: ```ShellSession # parted /dev/sda -- mklabel gpt # parted /dev/sda -- mkpart primary 512MB -8GB @@ -562,9 +558,8 @@ corresponding configuration Nix expression. ::: ::: {#ex-install-sequence .example} -::: {.title} **Example: Commands for Installing NixOS on `/dev/sda`** -::: + With a partitioned disk. ```ShellSession @@ -583,9 +578,7 @@ With a partitioned disk. ::: ::: {#ex-config .example} -::: {.title} **Example: NixOS Configuration** -::: ```ShellSession { config, pkgs, ... }: { imports = [ @@ -609,11 +602,11 @@ With a partitioned disk. ## Additional installation notes {#sec-installation-additional-notes} -```{=docbook} - - - - - - +```{=include=} sections +installing-usb.section.md +installing-pxe.section.md +installing-kexec.section.md +installing-virtualbox-guest.section.md +installing-from-other-distro.section.md +installing-behind-a-proxy.section.md ``` diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml deleted file mode 100644 index ddb1408fdcf5..000000000000 --- a/nixos/doc/manual/man-configuration.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - configuration.nix - 5 - NixOS - - - - configuration.nix - NixOS system configuration specification - - - Description - - The file /etc/nixos/configuration.nix contains the - declarative specification of your NixOS system configuration. The command - nixos-rebuild takes this file and realises the system - configuration specified therein. - - - - Options - - You can use the following options in configuration.nix. - - - - diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 0186221bddce..52183f1f9ee0 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -14,5 +14,33 @@ 2007-2022Eelco Dolstra and the Nixpkgs/NixOS contributors - + + + configuration.nix + 5 + NixOS + + + + configuration.nix + NixOS system configuration specification + + + Description + + The file /etc/nixos/configuration.nix contains the + declarative specification of your NixOS system configuration. The command + nixos-rebuild takes this file and realises the system + configuration specified therein. + + + + Options + + You can use the following options in configuration.nix. + + + + diff --git a/nixos/doc/manual/manpages/README.md b/nixos/doc/manual/manpages/README.md index ed2682e5332d..9923f4823922 100644 --- a/nixos/doc/manual/manpages/README.md +++ b/nixos/doc/manual/manpages/README.md @@ -4,6 +4,8 @@ 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 diff --git a/nixos/doc/manual/manual.md b/nixos/doc/manual/manual.md new file mode 100644 index 000000000000..1972eaeda872 --- /dev/null +++ b/nixos/doc/manual/manual.md @@ -0,0 +1,53 @@ +# NixOS Manual {#book-nixos-manual} +## Version @NIXOS_VERSION@ + + + +```{=include=} preface +preface.md +``` + +```{=include=} parts +installation/installation.md +configuration/configuration.md +administration/running.md +development/development.md +``` + +```{=include=} chapters +contributing-to-this-manual.chapter.md +``` + +```{=include=} appendix +nixos-options.md +release-notes/release-notes.md +``` diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml deleted file mode 100644 index 158b3507a58e..000000000000 --- a/nixos/doc/manual/manual.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - NixOS Manual - Version - - - - - - - - - - Configuration Options - - - - - diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh deleted file mode 100755 index 4698e94f508b..000000000000 --- a/nixos/doc/manual/md-to-db.sh +++ /dev/null @@ -1,52 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/22.11 -i bash -p pandoc - -# This script is temporarily needed while we transition the manual to -# CommonMark. It converts the .md files in the regular manual folder -# into DocBook files in the from_md folder. - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -pushd "$DIR" - -link_manpages_filter=$(nix-build --no-out-link "$DIR/../../../doc/build-aux/pandoc-filters/link-manpages.nix") - -# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile). -# TODO: Remove raw-attribute when we can get rid of DocBook altogether. -pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute -pandoc_flags=( - # Not needed: - # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) - # - media extraction (was only required for diagram generator) - # - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) - "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua" - "--lua-filter=$link_manpages_filter" - "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua" - "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua" - "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua" - -f "commonmark${pandoc_commonmark_enabled_extensions}+smart" - -t docbook -) - -OUT="$DIR/from_md" -mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') - -for mf in ${MD_FILES[*]}; do - if [ "${mf: -11}" == ".section.md" ]; then - mkdir -p "$(dirname "$OUT/$mf")" - OUTFILE="$OUT/${mf%".section.md"}.section.xml" - pandoc "$mf" "${pandoc_flags[@]}" \ - -o "$OUTFILE" - grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" - fi - - if [ "${mf: -11}" == ".chapter.md" ]; then - mkdir -p "$(dirname "$OUT/$mf")" - OUTFILE="$OUT/${mf%".chapter.md"}.chapter.xml" - pandoc "$mf" "${pandoc_flags[@]}" \ - --top-level-division=chapter \ - -o "$OUTFILE" - grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" - fi -done - -popd diff --git a/nixos/doc/manual/nixos-options.md b/nixos/doc/manual/nixos-options.md new file mode 100644 index 000000000000..33b487c95a2e --- /dev/null +++ b/nixos/doc/manual/nixos-options.md @@ -0,0 +1,7 @@ +# Configuration Options {#ch-options} + +```{=include=} options +id-prefix: opt- +list-id: configuration-variable-list +source: @NIXOS_OPTIONS_JSON@ +``` diff --git a/nixos/doc/manual/preface.md b/nixos/doc/manual/preface.md new file mode 100644 index 000000000000..d5e6364780a7 --- /dev/null +++ b/nixos/doc/manual/preface.md @@ -0,0 +1,11 @@ +# Preface {#preface} + +This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system [Nix](https://nixos.org/nix), that is composed using modules and packages defined in the [Nixpkgs](https://nixos.org/nixpkgs) project. + +Additional information regarding the Nix package manager and the Nixpkgs project can be found in respectively the [Nix manual](https://nixos.org/nix/manual) and the [Nixpkgs manual](https://nixos.org/nixpkgs/manual). + +If you encounter problems, please report them on the [`Discourse`](https://discourse.nixos.org), the [Matrix room](https://matrix.to/#nix:nixos.org), or on the [`#nixos` channel on Libera.Chat](irc://irc.libera.chat/#nixos). Alternatively, consider [contributing to this manual](#chap-contributing). Bugs should be reported in [NixOS’ GitHub issue tracker](https://github.com/NixOS/nixpkgs/issues). + +::: {.note} +Commands prefixed with `#` have to be run as root, either requiring to login as root user or temporarily switching to it using `sudo` for example. +::: diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml deleted file mode 100644 index c0d530c3d1b5..000000000000 --- a/nixos/doc/manual/preface.xml +++ /dev/null @@ -1,42 +0,0 @@ - - Preface - - This manual describes how to install, use and extend NixOS, a Linux - distribution based on the purely functional package management system - Nix, that is composed - using modules and packages defined in the - Nixpkgs project. - - - Additional information regarding the Nix package manager and the Nixpkgs - project can be found in respectively the - Nix manual and the - Nixpkgs manual. - - - If you encounter problems, please report them on the - Discourse, - the Matrix room, - or on the - #nixos channel on Libera.Chat. - Alternatively, consider - contributing to this manual. Bugs should be - reported in - NixOS’ - GitHub issue tracker. - - - - Commands prefixed with # have to be run as root, either - requiring to login as root user or temporarily switching to it using - sudo for example. - - - diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md new file mode 100644 index 000000000000..ac61de3793e8 --- /dev/null +++ b/nixos/doc/manual/release-notes/release-notes.md @@ -0,0 +1,25 @@ +# Release Notes {#ch-release-notes} + +This section lists the release notes for each stable version of NixOS and current unstable revision. + +```{=include=} sections +rl-2305.section.md +rl-2211.section.md +rl-2205.section.md +rl-2111.section.md +rl-2105.section.md +rl-2009.section.md +rl-2003.section.md +rl-1909.section.md +rl-1903.section.md +rl-1809.section.md +rl-1803.section.md +rl-1709.section.md +rl-1703.section.md +rl-1609.section.md +rl-1603.section.md +rl-1509.section.md +rl-1412.section.md +rl-1404.section.md +rl-1310.section.md +``` diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml deleted file mode 100644 index bb5cc677afb8..000000000000 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ /dev/null @@ -1,30 +0,0 @@ - - Release Notes - - This section lists the release notes for each stable version of NixOS and - current unstable revision. - - - - - - - - - - - - - - - - - - - - - diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 2977a9e6a1c7..460d03b6c6de 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. +- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed. + - `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands. ## New Services {#sec-release-23.05-new-services} @@ -32,13 +34,17 @@ In addition to numerous new and upgraded packages, this release has the followin - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). +- [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable). + +- [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.enable). + - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). - [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,6 +54,8 @@ 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} @@ -60,6 +68,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `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). +- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes` + - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. @@ -95,10 +105,14 @@ In addition to numerous new and upgraded packages, this release has the followin - Calling `makeSetupHook` without passing a `name` argument is deprecated. +- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. + - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. - 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. @@ -124,7 +138,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. @@ -197,6 +221,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. @@ -207,12 +233,32 @@ 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)). +- `services.xserver.desktopManager.plasma5.phononBackend` now defaults to vlc according to [upstrean recommendation](https://community.kde.org/Distributions/Packaging_Recommendations#Non-Plasma_packages) + +- 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/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix deleted file mode 100644 index e5ec9b8f97f7..000000000000 --- a/nixos/doc/manual/shell.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - pkgs = import ../../.. { }; -in -pkgs.mkShell { - name = "nixos-manual"; - - packages = with pkgs; [ xmlformat jing xmloscopy ruby ]; -} diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb deleted file mode 100755 index 02168016b554..000000000000 --- a/nixos/doc/varlistentry-fixer.rb +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/env ruby - -# This script is written intended as a living, evolving tooling -# to fix oopsies within the docbook documentation. -# -# This is *not* a formatter. It, instead, handles some known cases -# where something bad happened, and fixing it manually is tedious. -# -# Read the code to see the different cases it handles. -# -# ALWAYS `make format` after fixing with this! -# ALWAYS read the changes, this tool isn't yet proven to be always right. - -require "rexml/document" -include REXML - -if ARGV.length < 1 then - $stderr.puts "Needs a filename." - exit 1 -end - -filename = ARGV.shift -doc = Document.new(File.open(filename)) - -$touched = false - -# Fixing varnames having a sibling element without spacing. -# This is to fix an initial `xmlformat` issue where `term` -# would mangle as spaces. -# -# -# types.separatedStringsep <---- -# -# ... -# -# Generates: types.separatedStringsep -# ^^^^ -# -# -# -# makeWrapperexecutablewrapperfileargs <---- -# -# -# Generates: makeWrapperexecutablewrapperfileargs -# ^^^^ ^^^^ ^^ ^^ -# -# -# namevalue <----- -# -# -# Generates: --optionnamevalue -# ^^ ^^ -doc.elements.each("//varlistentry/term") do |term| - ["varname", "function", "option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - - - -# -# nixos-option -# -# path <------ -# -# -# Generates: -Ipath -# ^^ -doc.elements.each("//cmdsynopsis/arg") do |term| - ["option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - -# -# -# -# -# -# -# -# -# -# -# name <---- -# -# -# Generates: [{--profile-name | -p }name] -# ^^^^ -doc.elements.each("//cmdsynopsis/arg") do |term| - ["group"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - - -if $touched then - doc.context[:attribute_quote] = :quote - doc.write(output: File.open(filename, "w")) -end diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 271af9ba1801..50fb9ede08de 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/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}" @@ -152,7 +152,7 @@ in rec { pkgs.nixos-render-docs ]; } '' - nixos-render-docs options docbook \ + nixos-render-docs -j $NIX_BUILD_CORES options docbook \ --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ --revision ${lib.escapeShellArg revision} \ --document-type ${lib.escapeShellArg documentType} \ diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 8f01833bffb4..0db7930f496b 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/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/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 65754fe3c541..805b7520edff 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -22,7 +22,7 @@ in }; timeout = lib.mkOption { type = types.nullOr types.int; - default = null; # NOTE: null values are filtered out by `meta`. + default = 3600; # 1 hour description = mdDoc '' The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. ''; diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index c8cf2a04fb10..ee55da1e9ce2 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/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/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 1d0bc73cac2a..eb1e41a3d8dc 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,8 +30,8 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; - ffmpeg_4 = super.ffmpeg_4-headless; - ffmpeg_5 = super.ffmpeg_5-headless; + ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; + ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; }; # dep of graphviz, libXpm is optional for Xpm support gd = super.gd.override { withXorg = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; @@ -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; }; @@ -65,6 +67,7 @@ with lib; stoken = super.stoken.override { withGTK3 = false; }; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 util-linux = super.util-linux.override { translateManpages = false; }; + vim-full = super.vim-full.override { guiSupport = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index ec6868484942..07a0aa339a56 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/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/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index 87ac53a60b7e..4df646cf2796 100644 --- a/nixos/modules/config/zram.nix +++ b/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/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index cee230ac41cb..2eff322d9601 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/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/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index caf97f66ef31..d1b16d042d86 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/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/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 17ea04cb4ecb..a434932497d9 100644 --- a/nixos/modules/misc/ids.nix +++ b/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/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 30d11913c533..447f8193855f 100644 --- a/nixos/modules/misc/version.nix +++ b/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/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2757a196555e..9ce78c9eb124 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -223,6 +223,7 @@ ./programs/seahorse.nix ./programs/sedutil.nix ./programs/shadow.nix + ./programs/sharing.nix ./programs/singularity.nix ./programs/skim.nix ./programs/slock.nix @@ -697,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 @@ -858,6 +860,7 @@ ./services/networking/i2pd.nix ./services/networking/icecream/daemon.nix ./services/networking/icecream/scheduler.nix + ./services/networking/imaginary.nix ./services/networking/inspircd.nix ./services/networking/iodine.nix ./services/networking/iperf3.nix @@ -1045,6 +1048,7 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/meilisearch.nix + ./services/search/opensearch.nix ./services/search/solr.nix ./services/security/aesmd.nix ./services/security/certmgr.nix @@ -1305,6 +1309,7 @@ ./system/boot/systemd/logind.nix ./system/boot/systemd/nspawn.nix ./system/boot/systemd/oomd.nix + ./system/boot/systemd/repart.nix ./system/boot/systemd/shutdown.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix @@ -1365,6 +1370,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/nixos/modules/programs/k3b.nix b/nixos/modules/programs/k3b.nix index cdaed3cf70fb..5d19e4f1cc4f 100644 --- a/nixos/modules/programs/k3b.nix +++ b/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/nixos/modules/programs/proxychains.nix b/nixos/modules/programs/proxychains.nix index 0771f03c77d3..a52783aa6698 100644 --- a/nixos/modules/programs/proxychains.nix +++ b/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/nixos/modules/programs/qdmr.nix b/nixos/modules/programs/qdmr.nix index c0b1984eff91..1bb81317bda8 100644 --- a/nixos/modules/programs/qdmr.nix +++ b/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/nixos/modules/programs/sharing.nix b/nixos/modules/programs/sharing.nix new file mode 100644 index 000000000000..9ab51859dc51 --- /dev/null +++ b/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/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index 9648d0c27874..4884e5bdf2dd 100644 --- a/nixos/modules/programs/singularity.nix +++ b/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/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 36b724e04bde..3b8da78e2af5 100644 --- a/nixos/modules/programs/ssh.nix +++ b/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/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index b0a766dd055f..3b2e69bd37c3 100644 --- a/nixos/modules/programs/sway.nix +++ b/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/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index f33898578b81..de427ccb295b 100644 --- a/nixos/modules/security/polkit.nix +++ b/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/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index 811b81030efc..b74cc3f9c0b4 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -48,8 +48,46 @@ in { systemd.services.ympd = { description = "Standalone MPD Web GUI written in C"; + wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${toString cfg.webPort} --user nobody"; + after = [ "network-online.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.ympd}/bin/ympd \ + --host ${cfg.mpd.host} \ + --port ${toString cfg.mpd.port} \ + --webport ${toString cfg.webPort} + ''; + + DynamicUser = true; + NoNewPrivileges = true; + + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + SystemCallFilter = [ + "@system-service" + "~@process" + "~@setuid" + ]; + }; }; }; diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index ce914003c622..8e7059e5b59d 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/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/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 7aa2a8323b1d..dc851688fbec 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/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/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 3ede1cb80e85..8e935d621be4 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/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/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 0c80e79d4b79..344c43a429b3 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/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/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 3e6dba16e8ac..6b44d39c224e 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -34,7 +34,7 @@ let text = if (cfg.configFile != null) then '' cp ${cfg.configFile} ${configPath} # make config file readable by service - chown -R --reference=$HOME $(dirname ${configPath}) + chown -R --reference="$HOME" "$(dirname ${configPath})" '' else '' export CONFIG_FILE=${configPath} diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 04dd20b5f14d..1f4a39765cd7 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -54,7 +54,7 @@ with lib; AmbientCapabilities = "CAP_SYS_NICE"; StateDirectory = "clickhouse"; LogsDirectory = "clickhouse"; - ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml"; + ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml"; }; }; diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 0006ba1a7bad..a8db7dce8fdf 100644 --- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/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/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 7de11b08b7e7..0faeb4c0e9fa 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/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/nixos/modules/services/games/freeciv.nix b/nixos/modules/services/games/freeciv.nix index 8b340bb161a5..f33ea5c08a27 100644 --- a/nixos/modules/services/games/freeciv.nix +++ b/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/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 84265eb8f947..bb730037277b 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -8,19 +8,9 @@ let keyboard = { options = { devices = mkOption { - type = types.addCheck (types.listOf types.str) - (devices: (length devices) > 0); + type = types.listOf types.str; example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ]; - # TODO replace note with tip, which has not been implemented yet in - # nixos/lib/make-options-doc/mergeJSON.py - description = mdDoc '' - Paths to keyboard devices. - - ::: {.note} - To avoid unnecessary triggers of the service unit, unplug devices in - the order of the list. - ::: - ''; + description = mdDoc "Paths to keyboard devices."; }; config = mkOption { type = types.lines; @@ -44,8 +34,10 @@ let cap (tap-hold 100 100 caps lctl)) ''; description = mdDoc '' - Configuration other than `defcfg`. See [example config - files](https://github.com/jtroo/kanata) for more information. + Configuration other than `defcfg`. + + See [example config files](https://github.com/jtroo/kanata) + for more information. ''; }; extraDefCfg = mkOption { @@ -53,8 +45,12 @@ let default = ""; example = "danger-enable-cmd yes"; description = mdDoc '' - Configuration of `defcfg` other than `linux-dev`. See [example - config files](https://github.com/jtroo/kanata) for more information. + Configuration of `defcfg` other than `linux-dev` (generated + from the devices option) and + `linux-continue-if-no-devs-found` (hardcoded to be yes). + + See [example config files](https://github.com/jtroo/kanata) + for more information. ''; }; extraArgs = mkOption { @@ -67,8 +63,7 @@ let default = null; example = 6666; description = mdDoc '' - Port to run the notification server on. `null` will not run the - server. + Port to run the TCP server on. `null` will not run the server. ''; }; }; @@ -76,28 +71,23 @@ let mkName = name: "kanata-${name}"; - mkDevices = devices: concatStringsSep ":" devices; + mkDevices = devices: + optionalString ((length devices) > 0) "linux-dev ${concatStringsSep ":" devices}"; mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" '' (defcfg ${keyboard.extraDefCfg} - linux-dev ${mkDevices keyboard.devices}) + ${mkDevices keyboard.devices} + linux-continue-if-no-devs-found yes) ${keyboard.config} ''; mkService = name: keyboard: nameValuePair (mkName name) { - description = "kanata for ${mkDevices keyboard.devices}"; - - # Because path units are used to activate service units, which - # will start the old stopped services during "nixos-rebuild - # switch", stopIfChanged here is a workaround to make sure new - # services are running after "nixos-rebuild switch". - stopIfChanged = false; - + wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = '' - ${cfg.package}/bin/kanata \ + ${getExe cfg.package} \ --cfg ${mkConfig name keyboard} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ @@ -146,37 +136,10 @@ let UMask = "0077"; }; }; - - mkPathName = i: name: "${mkName name}-${toString i}"; - - mkPath = name: n: i: device: - nameValuePair (mkPathName i name) { - description = - "${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}"; - wantedBy = optional (i == 0) "multi-user.target"; - pathConfig = { - PathExists = device; - # (ab)use systemd.path to construct a trigger chain so that the - # service unit is only started when all paths exist - # however, manual of systemd.path says Unit's suffix is not ".path" - Unit = - if (i + 1) == n - then "${mkName name}.service" - else "${mkPathName (i + 1) name}.path"; - }; - unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service"; - }; - - mkPaths = name: keyboard: - let - n = length keyboard.devices; - in - imap0 (mkPath name n) keyboard.devices - ; in { options.services.kanata = { - enable = mkEnableOption (lib.mdDoc "kanata"); + enable = mkEnableOption (mdDoc "kanata"); package = mkOption { type = types.package; default = pkgs.kanata; @@ -201,14 +164,7 @@ in config = mkIf cfg.enable { hardware.uinput.enable = true; - systemd = { - paths = trivial.pipe cfg.keyboards [ - (mapAttrsToList mkPaths) - concatLists - listToAttrs - ]; - services = mapAttrs' mkService cfg.keyboards; - }; + systemd.services = mapAttrs' mkService cfg.keyboards; }; meta.maintainers = with maintainers; [ linj ]; diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index 7368845dafd5..c53dbf477742 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -1,10 +1,9 @@ # Udisks daemon. - { config, lib, pkgs, ... }: - with lib; let + cfg = config.services.udisks2; settingsFormat = pkgs.formats.ini { listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {}); }; @@ -19,7 +18,17 @@ in services.udisks2 = { - enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices."); + enable = mkEnableOption (mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices"); + + mountOnMedia = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + When enabled, instructs udisks2 to mount removable drives under `/media/` directory, instead of the + default, ACL-controlled `/run/media/$USER/`. Since `/media/` is not mounted as tmpfs by default, it + requires cleanup to get rid of stale mountpoints; enabling this option will take care of this at boot. + ''; + }; settings = mkOption rec { type = types.attrsOf settingsFormat.type; @@ -44,7 +53,7 @@ in }; }; ''; - description = lib.mdDoc '' + description = mdDoc '' Options passed to udisksd. See [here](http://manpages.ubuntu.com/manpages/latest/en/man5/udisks2.conf.5.html) and drive configuration in [here](http://manpages.ubuntu.com/manpages/latest/en/man8/udisks.8.html) for supported options. @@ -73,10 +82,15 @@ in services.dbus.packages = [ pkgs.udisks2 ]; - systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; + systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ] + ++ optional cfg.mountOnMedia "D! /media 0755 root root -"; services.udev.packages = [ pkgs.udisks2 ]; + services.udev.extraRules = optionalString cfg.mountOnMedia '' + ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1" + ''; + systemd.packages = [ pkgs.udisks2 ]; }; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index f6a167572f72..21bafd859c3c 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/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/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index eeb113e204c6..5f3a9b56292d 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -223,22 +223,59 @@ in { ''; }; + ensureAccounts = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + List of IMAP accounts which get automatically created. Note that for + a complete setup, user credentials for these accounts are required too + and can be created using the command `maddyctl creds`. + This option does not delete accounts which are not (anymore) listed. + ''; + example = [ + "user1@localhost" + "user2@localhost" + ]; + }; + }; }; config = mkIf cfg.enable { systemd = { + packages = [ pkgs.maddy ]; - services.maddy = { - serviceConfig = { - User = cfg.user; - Group = cfg.group; - StateDirectory = [ "maddy" ]; + services = { + maddy = { + serviceConfig = { + User = cfg.user; + Group = cfg.group; + StateDirectory = [ "maddy" ]; + }; + restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; + wantedBy = [ "multi-user.target" ]; }; - restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; - wantedBy = [ "multi-user.target" ]; + maddy-ensure-accounts = { + script = '' + ${optionalString (cfg.ensureAccounts != []) '' + ${concatMapStrings (account: '' + if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then + ${pkgs.maddy}/bin/maddyctl imap-acct create ${account} + fi + '') cfg.ensureAccounts} + ''} + ''; + serviceConfig = { + Type = "oneshot"; + User= "maddy"; + }; + after = [ "maddy.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + }; environment.etc."maddy/maddy.conf" = { diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index e05820fb87cf..95dc2f6aa2c9 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/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/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 15f0f0cc0cdb..f579c2529c0a 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -5,7 +5,6 @@ with lib; let dataDir = "/var/lib/matrix-appservice-discord"; registrationFile = "${dataDir}/discord-registration.yaml"; - appDir = "${pkgs.matrix-appservice-discord}/${pkgs.matrix-appservice-discord.passthru.nodeAppDir}"; cfg = config.services.matrix-appservice-discord; opt = options.services.matrix-appservice-discord; # TODO: switch to configGen.json once RFC42 is implemented @@ -16,6 +15,15 @@ in { services.matrix-appservice-discord = { enable = mkEnableOption (lib.mdDoc "a bridge between Matrix and Discord"); + package = mkOption { + type = types.package; + default = pkgs.matrix-appservice-discord; + defaultText = literalExpression "pkgs.matrix-appservice-discord"; + description = lib.mdDoc '' + Which package of matrix-appservice-discord to use. + ''; + }; + settings = mkOption rec { # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented type = types.attrs; @@ -114,7 +122,7 @@ in { preStart = '' if [ ! -f '${registrationFile}' ]; then - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --generate-registration \ --url=${escapeShellArg cfg.url} \ ${optionalString (cfg.localpart != null) "--localpart=${escapeShellArg cfg.localpart}"} \ @@ -135,13 +143,13 @@ in { DynamicUser = true; PrivateTmp = true; - WorkingDirectory = appDir; + WorkingDirectory = "${cfg.package}/${cfg.package.passthru.nodeAppDir}"; StateDirectory = baseNameOf dataDir; UMask = "0027"; EnvironmentFile = cfg.environmentFile; ExecStart = '' - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --file='${registrationFile}' \ --config='${settingsFile}' \ --port='${toString cfg.port}' diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index c94852e3aad9..508e2862b63f 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/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/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix index 6353966f5c3f..3f6d97f85738 100644 --- a/nixos/modules/services/misc/input-remapper.nix +++ b/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/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 62064b5d90fb..53638ded2963 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -11,6 +11,8 @@ let else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; mkKeyValue = generators.mkKeyValueDefault {} ":"; }; + + unifiedConfigDir = cfg.stateDir + "/config"; in { options = { services.moonraker = { @@ -30,11 +32,10 @@ in { }; configDir = mkOption { - type = types.path; - default = cfg.stateDir + "/config"; - defaultText = literalExpression ''config.${opt.stateDir} + "/config"''; + type = types.nullOr types.path; + default = null; description = lib.mdDoc '' - The directory containing client-writable configuration files. + Deprecated directory containing client-writable configuration files. Clients will be able to edit files in this directory via the API. This directory must be writable. ''; @@ -96,8 +97,18 @@ in { }; config = mkIf cfg.enable { - warnings = optional (cfg.settings ? update_manager) - ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''; + warnings = [] + ++ optional (cfg.settings ? update_manager) + ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'' + ++ optional (cfg.configDir != null) + '' + services.moonraker.configDir has been deprecated upstream and will be removed. + + Action: ${ + if cfg.configDir == unifiedConfigDir then "Simply remove services.moonraker.configDir from your config." + else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config." + } + ''; assertions = [ { @@ -124,20 +135,20 @@ in { port = cfg.port; klippy_uds_address = cfg.klipperSocket; }; + machine = { + validate_service = false; + }; + } // (lib.optionalAttrs (cfg.configDir != null) { file_manager = { config_path = cfg.configDir; }; - database = { - database_path = "${cfg.stateDir}/database"; - }; - }; + }); fullConfig = recursiveUpdate cfg.settings forcedConfig; in format.generate "moonraker.cfg" fullConfig; systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -" - ]; + ] ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"; systemd.services.moonraker = { description = "Moonraker, an API web server for Klipper"; @@ -147,9 +158,16 @@ in { # Moonraker really wants its own config to be writable... script = '' - cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg - chmod u+w ${cfg.configDir}/moonraker-temp.cfg - exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg + config_path=${ + # Deprecated separate config dir + if cfg.configDir != null then "${cfg.configDir}/moonraker-temp.cfg" + # Config in unified data path + else "${unifiedConfigDir}/moonraker-temp.cfg" + } + mkdir -p $(dirname "$config_path") + cp /etc/moonraker.cfg "$config_path" + chmod u+w "$config_path" + exec ${pkg}/bin/moonraker -d ${cfg.stateDir} -c "$config_path" ''; # Needs `ip` command @@ -184,5 +202,6 @@ in { meta.maintainers = with maintainers; [ cab404 vtuan10 + zhaofengli ]; } diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index f0cb5cc15138..2d0d91f95985 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -185,6 +185,13 @@ in description = lib.mdDoc "Replace YouTube links with links to this instance (blank to disable)."; }; + replaceReddit = mkOption { + type = types.str; + default = ""; + example = "teddit.net"; + description = lib.mdDoc "Replace Reddit links with links to this instance (blank to disable)."; + }; + replaceInstagram = mkOption { type = types.str; default = ""; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 314388e0152e..be3accc0d7e5 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/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/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index b2cadbf0c436..d4391bc49e31 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/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/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix new file mode 100644 index 000000000000..2947b4d80120 --- /dev/null +++ b/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/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 4185cd76c4eb..67dc1bc19edd 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/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/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index fdaefbe17f2d..44fc359b6a7d 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -409,7 +409,7 @@ in provision = { enable = cfg.provision.grafana.datasource || cfg.provision.grafana.dashboard; - datasources = + datasources.settings.datasources = let esVersion = lib.getVersion config.services.elasticsearch.package; in @@ -435,7 +435,7 @@ in }; } ]; - dashboards = lib.mkIf cfg.provision.grafana.dashboard [{ + dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{ name = "parsedmarc"; options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; }]; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix index 537d72e85c8f..6f403b3e58c8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix +++ b/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/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix b/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix index 5cd1e2c65e90..3b7f978528cd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix +++ b/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/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 886e14b5f6c9..5f803d57b5e9 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/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/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix index ab82a2a07dd4..49cbc89d5a91 100644 --- a/nixos/modules/services/network-filesystems/moosefs.nix +++ b/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/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix index ab784563e4ac..46b26195d211 100644 --- a/nixos/modules/services/networking/blockbook-frontend.nix +++ b/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/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index 20cfebb79914..c68ceab9619c 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -6,18 +6,29 @@ let cfg = config.services.envoy; format = pkgs.formats.json { }; conf = format.generate "envoy.json" cfg.settings; - validateConfig = file: + validateConfig = required: file: pkgs.runCommand "validate-envoy-conf" { } '' - ${pkgs.envoy}/bin/envoy --log-level error --mode validate -c "${file}" + ${cfg.package}/bin/envoy --log-level error --mode validate -c "${file}" ${lib.optionalString (!required) "|| true"} cp "${file}" "$out" ''; - in { options.services.envoy = { enable = mkEnableOption (lib.mdDoc "Envoy reverse proxy"); + package = mkPackageOptionMD pkgs "envoy" { }; + + requireValidConfig = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether a failure during config validation at build time is fatal. + When the config can't be checked during build time, for example when it includes + other files, disable this option. + ''; + }; + settings = mkOption { type = format.type; default = { }; @@ -46,38 +57,44 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.envoy ]; + environment.systemPackages = [ cfg.package ]; systemd.services.envoy = { description = "Envoy reverse proxy"; after = [ "network-online.target" ]; requires = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}"; - DynamicUser = true; + ExecStart = "${cfg.package}/bin/envoy -c ${validateConfig cfg.requireValidConfig conf}"; + CacheDirectory = [ "envoy" ]; + LogsDirectory = [ "envoy" ]; Restart = "no"; - CacheDirectory = "envoy"; - LogsDirectory = "envoy"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK AF_XDP"; - SystemCallArchitectures = "native"; + # Hardening + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + DeviceAllow = [ "" ]; + DevicePolicy = "closed"; + DynamicUser = true; LockPersonality = true; - RestrictNamespaces = true; - RestrictRealtime = true; - PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + MemoryDenyWriteExecute = false; # at least wasmr needs WX permission PrivateDevices = true; + PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; + ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "ptraceable"; - ProtectHostname = true; ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_XDP" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0066"; - SystemCallFilter = "~@clock @module @mount @reboot @swap @obsolete @cpu-emulation"; }; }; }; diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index a06b9573a850..42924d7f6993 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/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/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index f13457fcde25..ecc158f8151d 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,6 +20,8 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} + ieee80211n=1 + ieee80211ac=1 ${optionalString (cfg.countryCode != null) "country_code=${cfg.countryCode}"} ${optionalString (cfg.countryCode != null) "ieee80211d=1"} @@ -34,6 +36,7 @@ let ${optionalString cfg.wpa '' wpa=2 + wpa_pairwise=CCMP wpa_passphrase=${cfg.wpaPassphrase} ''} ${optionalString cfg.noScan "noscan=1"} @@ -66,7 +69,6 @@ in }; interface = mkOption { - default = ""; example = "wlp2s0"; type = types.str; description = lib.mdDoc '' diff --git a/nixos/modules/services/networking/imaginary.nix b/nixos/modules/services/networking/imaginary.nix new file mode 100644 index 000000000000..5437da572778 --- /dev/null +++ b/nixos/modules/services/networking/imaginary.nix @@ -0,0 +1,110 @@ +{ lib, config, pkgs, utils, ... }: + +let + inherit (lib) mdDoc mkEnableOption mkIf mkOption types; + + cfg = config.services.imaginary; +in { + options.services.imaginary = { + enable = mkEnableOption (mdDoc "imaginary image processing microservice"); + + address = mkOption { + type = types.str; + default = ""; + description = mdDoc "Bind address. Corresponds to the `-a` flag."; + example = "localhost"; + }; + + port = mkOption { + type = types.port; + default = 8088; + description = mdDoc "Bind port. Corresponds to the `-p` flag."; + }; + + settings = mkOption { + description = mdDoc '' + Command line arguments passed to the imaginary executable, stripped of + the prefix `-`. See upstream's + [README](https://github.com/h2non/imaginary#command-line-usage) for all + options. + ''; + type = types.submodule { + freeformType = with types; attrsOf (oneOf [ + bool + int + (nonEmptyListOf str) + str + ]); + + options = { + return-size = mkOption { + type = types.bool; + default = false; + description = mdDoc "Return the image size in the HTTP headers."; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ { + assertion = ! lib.hasAttr "a" cfg.settings; + message = "Use services.imaginary.address to specify the -a flag."; + } { + assertion = ! lib.hasAttr "p" cfg.settings; + message = "Use services.imaginary.port to specify the -p flag."; + } ]; + + systemd.services.imaginary = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + ExecStart = let + args = lib.mapAttrsToList (key: val: + "-" + key + "=" + lib.concatStringsSep "," (map toString (lib.toList val)) + ) (cfg.settings // { a = cfg.address; p = cfg.port; }); + in "${pkgs.imaginary}/bin/imaginary ${utils.escapeSystemdExecArgs args}"; + ProtectProc = "invisible"; + BindReadOnlyPaths = lib.optional (cfg.settings ? mount) cfg.settings.mount; + CapabilityBoundingSet = if cfg.port < 1024 then + [ "CAP_NET_BIND_SERVICE" ] + else + [ "" ]; + AmbientCapabilities = CapabilityBoundingSet; + NoNewPrivileges = true; + DynamicUser = true; + ProtectSystem = "strict"; + ProtectHome = true; + TemporaryFileSystem = [ "/:ro" ]; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = cfg.port >= 1024; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + PrivateMounts = true; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + DevicePolicy = "closed"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 549f1fe5de30..d0de6cd4fdc6 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -16,7 +16,7 @@ in description = lib.mdDoc '' Whether to enable MiniDLNA, a simple DLNA server. It serves media files such as video and music to DLNA client devices - such as televisions and media players. If you use the firewall consider + such as televisions and media players. If you use the firewall, consider adding the following: `services.minidlna.openFirewall = true;` ''; }; @@ -54,10 +54,7 @@ in description = lib.mdDoc '' The interval between announces (in seconds). Instead of waiting for announces, you should set `openFirewall` option to use SSDP discovery. - Furthermore, this option has been set to 90000 in order to prevent disconnects with certain - clients and relies solely on the discovery. - - Lower values (e.g. 30 seconds) should be used if you can't use the discovery. + Lower values (e.g. 30 seconds) should be used if your network blocks the discovery unicast. Some relevant information can be found here: https://sourceforge.net/p/minidlna/discussion/879957/thread/1389d197/ ''; @@ -82,8 +79,8 @@ in }; options.root_container = mkOption { type = types.str; - default = "."; - example = "B"; + default = "B"; + example = "."; description = lib.mdDoc "Use a different container as the root of the directory tree presented to clients."; }; options.log_level = mkOption { @@ -133,22 +130,19 @@ in users.groups.minidlna.gid = config.ids.gids.minidlna; - systemd.services.minidlna = - { description = "MiniDLNA Server"; + systemd.services.minidlna = { + description = "MiniDLNA Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = - { User = "minidlna"; - Group = "minidlna"; - CacheDirectory = "minidlna"; - RuntimeDirectory = "minidlna"; - PIDFile = "/run/minidlna/pid"; - ExecStart = - "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" + - " -f ${settingsFile}"; - }; + serviceConfig = { + User = "minidlna"; + Group = "minidlna"; + CacheDirectory = "minidlna"; + RuntimeDirectory = "minidlna"; + PIDFile = "/run/minidlna/pid"; + ExecStart = "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid -f ${settingsFile}"; }; + }; }; } diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index 2bedafc5d9fe..e1a8c6740f57 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/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/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 492a0936fdbb..78d312af978b 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/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/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix index d4c4ca47bc80..7f0ac3e3b8e6 100644 --- a/nixos/modules/services/networking/soju.nix +++ b/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/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f2b8d12ccc94..095c7de0b7aa 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/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/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 1d6556f626be..b08f1015e8b8 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -176,7 +176,7 @@ let publicKey = mkOption { example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; - type = types.str; + type = types.singleLineStr; description = lib.mdDoc "The base64 public key of the peer."; }; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 73567ca0bc98..7c9fa62ae954 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/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/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix new file mode 100644 index 000000000000..df699b56747e --- /dev/null +++ b/nixos/modules/services/search/opensearch.nix @@ -0,0 +1,244 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.opensearch; + + settingsFormat = pkgs.formats.yaml {}; + + configDir = cfg.dataDir + "/config"; + + usingDefaultDataDir = cfg.dataDir == "/var/lib/opensearch"; + usingDefaultUserAndGroup = cfg.user == "opensearch" && cfg.group == "opensearch"; + + opensearchYml = settingsFormat.generate "opensearch.yml" cfg.settings; + + loggingConfigFilename = "log4j2.properties"; + loggingConfigFile = pkgs.writeTextFile { + name = loggingConfigFilename; + text = cfg.logging; + }; +in +{ + + options.services.opensearch = { + enable = mkEnableOption (lib.mdDoc "OpenSearch"); + + package = lib.mkPackageOptionMD pkgs "OpenSearch" { + default = [ "opensearch" ]; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options."network.host" = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Which port this service should listen on. + ''; + }; + + options."cluster.name" = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The name of the cluster. + ''; + }; + + options."discovery.type" = lib.mkOption { + type = lib.types.str; + default = "single-node"; + description = lib.mdDoc '' + The type of discovery to use. + ''; + }; + + options."http.port" = lib.mkOption { + type = lib.types.port; + default = 9200; + description = lib.mdDoc '' + The port to listen on for HTTP traffic. + ''; + }; + + options."transport.port" = lib.mkOption { + type = lib.types.port; + default = 9300; + description = lib.mdDoc '' + The port to listen on for transport traffic. + ''; + }; + }; + + default = {}; + + description = lib.mdDoc '' + OpenSearch configuration. + ''; + }; + + logging = lib.mkOption { + description = lib.mdDoc "opensearch logging configuration."; + + default = '' + logger.action.name = org.opensearch.action + logger.action.level = info + + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + ''; + type = types.str; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/opensearch"; + apply = converge (removeSuffix "/"); + description = lib.mdDoc '' + Data directory for OpenSearch. If you change this, you need to + manually create the directory. You also need to create the + `opensearch` user and group, or change + [](#opt-services.opensearch.user) and + [](#opt-services.opensearch.group) to existing ones with + access to the directory. + ''; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The user OpenSearch runs as. Should be left at default unless + you have very specific needs. + ''; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The group OpenSearch runs as. Should be left at default unless + you have very specific needs. + ''; + }; + + extraCmdLineOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for the OpenSearch launcher."; + default = [ ]; + type = lib.types.listOf lib.types.str; + }; + + extraJavaOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for Java."; + default = [ ]; + type = lib.types.listOf lib.types.str; + example = [ "-Djava.net.preferIPv4Stack=true" ]; + }; + + restartIfChanged = lib.mkOption { + type = lib.types.bool; + description = lib.mdDoc '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; + + config = mkIf cfg.enable { + systemd.services.opensearch = { + description = "OpenSearch Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; + environment = { + OPENSEARCH_HOME = cfg.dataDir; + OPENSEARCH_JAVA_OPTS = toString cfg.extraJavaOptions; + OPENSEARCH_PATH_CONF = configDir; + }; + serviceConfig = { + ExecStartPre = + let + startPreFullPrivileges = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + '' + (optionalString (!config.boot.isContainer) '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + ''); + startPreUnprivileged = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Install plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules + + # opensearch needs to create the opensearch.keystore in the config directory + # so this directory needs to be writable. + mkdir -p ${configDir} + chmod 0700 ${configDir} + + # Note that we copy config files from the nix store instead of symbolically linking them + # because otherwise X-Pack Security will raise the following exception: + # java.security.AccessControlException: + # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") + + cp ${opensearchYml} ${configDir}/opensearch.yml + + # Make sure the logging configuration for old OpenSearch versions is removed: + rm -f "${configDir}/logging.yml" + cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} + mkdir -p ${configDir}/scripts + cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options + + # redirect jvm logs to the data directory + mkdir -p ${cfg.dataDir}/logs + chmod 0700 ${cfg.dataDir}/logs + sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options + ''; + in [ + "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}" + "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}" + ]; + ExecStartPost = pkgs.writeShellScript "opensearch-start-post" '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Make sure opensearch is up and running before dependents + # are started + while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do + sleep 1 + done + ''; + ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}"; + User = cfg.user; + Group = cfg.group; + LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; + DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir; + } // (optionalAttrs (usingDefaultDataDir) { + StateDirectory = "opensearch"; + StateDirectoryMode = "0700"; + }); + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 55120799c993..5583c39368f7 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/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/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index e446e606cad8..664335cb58e8 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/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/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index c91ff3e69a0a..ee57ec8bf812 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -57,6 +57,9 @@ in ]; }; + # Yubikey-agent expects pcsd to be running in order to function. + services.pcscd.enable = true; + environment.extraInit = '' if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index fc849be0c872..5419940a68d6 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = { ## Frontend management {#modules-services-akkoma-frontend-management} -Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be +Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be modified by setting [{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends). @@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u derivation. ```nix -services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { +services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" { config = builtins.toJSON { expertLevel = 1; collapseMessageWithSubject = false; @@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { passAsFile = [ "config" ]; } '' mkdir $out - lndir ${pkgs.akkoma-frontends.pleroma-fe} $out + lndir ${pkgs.akkoma-frontends.akkoma-fe} $out rm $out/static/config.json - jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ + jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \ >$out/static/config.json ''; ``` diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index fc482ff32deb..8d1775258612 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -51,13 +51,13 @@ let package = mkOption { type = types.package; description = mdDoc "Akkoma frontend package."; - example = literalExpression "pkgs.akkoma-frontends.pleroma-fe"; + example = literalExpression "pkgs.akkoma-frontends.akkoma-fe"; }; name = mkOption { type = types.nonEmptyStr; description = mdDoc "Akkoma frontend name."; - example = "pleroma-fe"; + example = "akkoma-fe"; }; ref = mkOption { @@ -476,8 +476,8 @@ in { type = with types; attrsOf (submodule frontend); default = { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { @@ -489,8 +489,8 @@ in { defaultText = literalExpression '' { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index ffd1085bde65..9c6284fd1b57 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/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/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 54cd5fd33bef..c85109b1479e 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -82,7 +82,7 @@ let basePackage = cfg.package; localConfig = dokuwikiLocalConfig hostName cfg; pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg; - aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; + aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; }; aclOpts = { ... }: { @@ -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/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix index 15ef09aa0b87..747b85f94c65 100644 --- a/nixos/modules/services/web-apps/galene.nix +++ b/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/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index 86716a02649c..0fc283ff5219 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/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/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix index 293cbb3af425..b2e274167164 100644 --- a/nixos/modules/services/web-apps/jirafeau.nix +++ b/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/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 7093d1de0dac..dd51174c8b8e 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/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/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 50c2d68c77e4..c5e161c2516a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -79,7 +79,7 @@ in { (which can be opened e.g. by running `nixos-help`). '') (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' - Use services.nextcloud.nginx.enableImagemagick instead. + Use services.nextcloud.enableImagemagick instead. '') ]; diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 79ed3e43dd18..3494f2fa21f0 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -229,6 +229,9 @@ in cp -r ${cfg.package}/etc/onlyoffice/documentserver/* /run/onlyoffice/config/ chmod u+w /run/onlyoffice/config/default.json + # Allow members of the onlyoffice group to serve files under /var/lib/onlyoffice/documentserver/App_Data + chmod g+x /var/lib/onlyoffice/documentserver + cp /run/onlyoffice/config/default.json{,.orig} # for a mapping of environment variables from the docker container to json options see @@ -267,7 +270,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper DocService/docservice /run/onlyoffice/config"; - ExecStartPre = onlyoffice-prestart; + ExecStartPre = [ onlyoffice-prestart ]; Group = "onlyoffice"; Restart = "always"; RuntimeDirectory = "onlyoffice"; @@ -284,6 +287,8 @@ in group = "onlyoffice"; isSystemUser = true; }; + + nginx.extraGroups = [ "onlyoffice" ]; }; users.groups.onlyoffice = { }; diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 50213ec252ff..f5a9cfac5d77 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/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/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1837ec936c69..bc5b4be51098 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/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/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 65b94f61c4ae..ab666ba39490 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/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 { @@ -162,8 +90,8 @@ in phononBackend = mkOption { type = types.enum [ "gstreamer" "vlc" ]; - default = "gstreamer"; - example = "vlc"; + default = "vlc"; + example = "gstreamer"; description = lib.mdDoc "Phonon audio backend to install."; }; @@ -388,7 +316,8 @@ in ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] - ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; + ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet + ++ lib.optional config.services.flatpak.enable flatpak-kcm; # Extra services for D-Bus activation services.dbus.packages = [ @@ -474,7 +403,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 +449,7 @@ in dolphin-plugins ffmpegthumbs kdegraphics-thumbnailers + pkgs.kio-admin kio-extras ]; optionalPackages = [ diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 574657a50c82..9c88d12ca6f2 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/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/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 7f817e5d350d..98db67e7c00e 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -316,11 +316,13 @@ in { mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ - "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - "systemd-binfmt.service" - ]; - systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { + additionalUpstreamSystemUnits = [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + }; }; } diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 701d242abc15..125f75d66706 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/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/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 8f203b2c8b32..0298e28f3289 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/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/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 03d03cb348e8..cdb5d8bf3c26 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/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/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index 03ef00e5683c..2dbc95e38ee3 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/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/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 620d76aef20d..70edc13dc0fa 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -495,7 +495,7 @@ in { # If we are not booting a NixOS closure (e.g. init=/bin/sh), # we don't know what root to prepare so we don't do anything - if ! [ -x "/sysroot$closure/prepare-root" ]; then + if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then echo "NEW_INIT=''${initParam[1]}" > /etc/switch-root.conf echo "$closure does not look like a NixOS installation - not activating" exit 0 diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix new file mode 100644 index 000000000000..8f3a70023770 --- /dev/null +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -0,0 +1,123 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.systemd.repart; + initrdCfg = config.boot.initrd.systemd.repart; + + writeDefinition = name: partitionConfig: pkgs.writeText + "${name}.conf" + (lib.generators.toINI { } { Partition = partitionConfig; }); + + listOfDefinitions = lib.mapAttrsToList + writeDefinition + (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions); + + # Create a directory in the store that contains a copy of all definition + # files. This is then passed to systemd-repart in the initrd so it can access + # the definition files after the sysroot has been mounted but before + # activation. This needs a hard copy of the files and not just symlinks + # because otherwise the files do not show up in the sysroot. + definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } '' + mkdir -p $out + ${(lib.concatStringsSep "\n" + (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) + )} + ''; +in +{ + options = { + boot.initrd.systemd.repart.enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // { + description = lib.mdDoc '' + Grow and add partitions to a partition table at boot time in the initrd. + systemd-repart only works with GPT partition tables. + + To run systemd-repart after the initrd, see + `options.systemd.repart.enable`. + ''; + }; + + systemd.repart = { + enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // { + description = lib.mdDoc '' + Grow and add partitions to a partition table. + systemd-repart only works with GPT partition tables. + + To run systemd-repart while in the initrd, see + `options.boot.initrd.systemd.repart.enable`. + ''; + }; + + partitions = lib.mkOption { + type = with lib.types; attrsOf (attrsOf (oneOf [ str int bool ])); + default = { }; + example = { + "10-root" = { + Type = "root"; + }; + "20-home" = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + }; + description = lib.mdDoc '' + Specify partitions as a set of the names of the definition files as the + key and the partition configuration as its value. The partition + configuration can use all upstream options. See + for all available options. + ''; + }; + }; + }; + + config = lib.mkIf (cfg.enable || initrdCfg.enable) { + # Always link the definitions into /etc so that they are also included in + # the /nix/store of the sysroot during early userspace (i.e. while in the + # initrd). + environment.etc."repart.d".source = definitionsDirectory; + + boot.initrd.systemd = lib.mkIf initrdCfg.enable { + additionalUpstreamUnits = [ + "systemd-repart.service" + ]; + + storePaths = [ + "${config.boot.initrd.systemd.package}/bin/systemd-repart" + ]; + + # Override defaults in upstream unit. + services.systemd-repart = { + # Unset the conditions as they cannot be met before activation because + # the definition files are not stored in the expected locations. + unitConfig.ConditionDirectoryNotEmpty = [ + " " # required to unset the previous value. + ]; + serviceConfig = { + # systemd-repart runs before the activation script. Thus we cannot + # rely on them being linked in /etc already. Instead we have to + # explicitly pass their location in the sysroot to the binary. + ExecStart = [ + " " # required to unset the previous value. + ''${config.boot.initrd.systemd.package}/bin/systemd-repart \ + --definitions=/sysroot${definitionsDirectory} \ + --dry-run=no + '' + ]; + }; + # Because the initrd does not have the `initrd-usr-fs.target` the + # upestream unit runs too early in the boot process, before the sysroot + # is available. However, systemd-repart needs access to the sysroot to + # find the definition files. + after = [ "sysroot.mount" ]; + }; + }; + + systemd = lib.mkIf cfg.enable { + additionalUpstreamSystemUnits = [ + "systemd-repart.service" + ]; + }; + }; + +} diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index 450b805f0f58..76344f5f87ea 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/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/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index d9bd10ba1fc8..505cb4e32e1e 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -163,7 +163,7 @@ in ###### implementation config = mkIf cfg.enable (mkMerge [{ - boot.kernelModules = [ "bridge" "veth" ]; + boot.kernelModules = [ "bridge" "veth" "br_netfilter" "xt_nat" ]; boot.kernel.sysctl = { "net.ipv4.conf.all.forwarding" = mkOverride 98 true; "net.ipv4.conf.default.forwarding" = mkOverride 98 true; diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix index d664e8269f41..bbf81bda9c02 100644 --- a/nixos/modules/virtualisation/linode-config.nix +++ b/nixos/modules/virtualisation/linode-config.nix @@ -6,8 +6,8 @@ with lib; services.openssh = { enable = true; - permitRootLogin = "prohibit-password"; - passwordAuthentication = mkDefault false; + settings.PermitRootLogin = "prohibit-password"; + settings.PasswordAuthentication = mkDefault false; }; networking = { diff --git a/nixos/modules/virtualisation/multipass.nix b/nixos/modules/virtualisation/multipass.nix new file mode 100644 index 000000000000..d066932b6120 --- /dev/null +++ b/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/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 6c00fabaa185..baca48305188 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -7,6 +7,8 @@ let podmanPackage = (pkgs.podman.override { extraPackages = cfg.extraPackages + # setuid shadow + ++ [ "/run/wrappers" ] ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; }); diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 2ea23d958cf7..bb42e6de069b 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/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/nixos/release.nix b/nixos/release.nix index 946379bcd661..78a74af41242 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -144,7 +144,6 @@ in rec { manual = manualHTML; # TODO(@oxij): remove eventually manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub)); manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages); - manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources); options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1fc8bb777db0..86dd096afc0b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -92,6 +92,7 @@ in { bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {}; beanstalkd = handleTest ./beanstalkd.nix {}; bees = handleTest ./bees.nix {}; + binary-cache = handleTest ./binary-cache.nix {}; bind = handleTest ./bind.nix {}; bird = handleTest ./bird.nix {}; bitcoind = handleTest ./bitcoind.nix {}; @@ -134,6 +135,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 +249,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 {}; @@ -412,8 +415,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 {}; @@ -484,6 +490,7 @@ in { ombi = handleTest ./ombi.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; + opensearch = discoverTests (import ./opensearch.nix); openresty-lua = handleTest ./openresty-lua.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; @@ -515,7 +522,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 {}; @@ -661,6 +667,7 @@ in { systemd-nspawn = handleTest ./systemd-nspawn.nix {}; systemd-oomd = handleTest ./systemd-oomd.nix {}; systemd-portabled = handleTest ./systemd-portabled.nix {}; + systemd-repart = handleTest ./systemd-repart.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {}; diff --git a/nixos/tests/binary-cache.nix b/nixos/tests/binary-cache.nix new file mode 100644 index 000000000000..0809e59e5a11 --- /dev/null +++ b/nixos/tests/binary-cache.nix @@ -0,0 +1,62 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "binary-cache"; + meta.maintainers = with maintainers; [ thomasjm ]; + + nodes.machine = + { pkgs, ... }: { + imports = [ ../modules/installer/cd-dvd/channel.nix ]; + environment.systemPackages = with pkgs; [python3]; + system.extraDependencies = with pkgs; [hello.inputDerivation]; + nix.extraOptions = '' + experimental-features = nix-command + ''; + }; + + testScript = '' + # Build the cache, then remove it from the store + cachePath = machine.succeed("nix-build --no-out-link -E 'with import {}; mkBinaryCache { rootPaths = [hello]; }'").strip() + machine.succeed("cp -r %s/. /tmp/cache" % cachePath) + machine.succeed("nix-store --delete " + cachePath) + + # Sanity test of cache structure + status, stdout = machine.execute("ls /tmp/cache") + cache_files = stdout.split() + assert ("nix-cache-info" in cache_files) + assert ("nar" in cache_files) + + # Nix store ping should work + machine.succeed("nix store ping --store file:///tmp/cache") + + # Cache should contain a .narinfo referring to "hello" + grepLogs = machine.succeed("grep -l 'StorePath: /nix/store/[[:alnum:]]*-hello-.*' /tmp/cache/*.narinfo") + + # Get the store path referenced by the .narinfo + narInfoFile = grepLogs.strip() + narInfoContents = machine.succeed("cat " + narInfoFile) + import re + match = re.match(r"^StorePath: (/nix/store/[a-z0-9]*-hello-.*)$", narInfoContents, re.MULTILINE) + if not match: raise Exception("Couldn't find hello store path in cache") + storePath = match[1] + + # Delete the store path + machine.succeed("nix-store --delete " + storePath) + machine.succeed("[ ! -d %s ] || exit 1" % storePath) + + # Should be able to build hello using the cache + logs = machine.succeed("nix-build -A hello '' --option require-sigs false --option trusted-substituters file:///tmp/cache --option substituters file:///tmp/cache 2>&1") + logLines = logs.split("\n") + if not "this path will be fetched" in logLines[0]: raise Exception("Unexpected first log line") + def shouldBe(got, desired): + if got != desired: raise Exception("Expected '%s' but got '%s'" % (desired, got)) + shouldBe(logLines[1], " " + storePath) + shouldBe(logLines[2], "copying path '%s' from 'file:///tmp/cache'..." % storePath) + shouldBe(logLines[3], storePath) + + # Store path should exist in the store now + machine.succeed("[ -d %s ] || exit 1" % storePath) + ''; +}) diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix new file mode 100644 index 000000000000..4a4983f9bc4e --- /dev/null +++ b/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/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 70d14f29e2e5..957b0296a755 100644 --- a/nixos/tests/cups-pdf.nix +++ b/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/nixos/tests/envoy.nix b/nixos/tests/envoy.nix index 9d2c32ce102f..1e4bfe626398 100644 --- a/nixos/tests/envoy.nix +++ b/nixos/tests/envoy.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { socket_address = { protocol = "TCP"; address = "127.0.0.1"; - port_value = 9901; + port_value = 80; }; }; }; @@ -22,12 +22,33 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { clusters = []; }; }; + specialisation = { + withoutConfigValidation.configuration = { ... }: { + services.envoy = { + requireValidConfig = false; + settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log"; + }; + }; + }; }; - testScript = '' - machine.start() - machine.wait_for_unit("envoy.service") - machine.wait_for_open_port(9901) - machine.wait_until_succeeds("curl -fsS localhost:9901/ready") - ''; + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.start() + + with subtest("envoy.service starts and responds with ready"): + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + + with subtest("envoy.service works with config path not available at eval time"): + machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test') + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + machine.succeed('test -f /var/log/envoy/access.log') + ''; }) diff --git a/nixos/tests/gnupg.nix b/nixos/tests/gnupg.nix new file mode 100644 index 000000000000..65a9a93007fd --- /dev/null +++ b/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/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 07d93c41c7a6..e168f8233c76 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -1,9 +1,13 @@ { system ? builtins.currentSystem , pkgs ? import ../../.. { inherit system; } +, lib ? pkgs.lib }: +let + allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; +in { # Run a single node k3s cluster and verify a pod can run - single-node = import ./single-node.nix { inherit system pkgs; }; + single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s; # Run a multi-node k3s cluster and verify pod networking works across nodes - multi-node = import ./multi-node.nix { inherit system pkgs; }; + multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s; } diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 9a6c7fd46573..932b4639b39c 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -39,7 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: tokenFile = pkgs.writeText "token" "p@s$w0rd"; in { - name = "k3s-multi-node"; + name = "${k3s.name}-multi-node"; nodes = { server = { pkgs, ... }: { @@ -52,7 +52,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: inherit tokenFile; enable = true; role = "server"; - package = pkgs.k3s; + package = k3s; clusterInit = true; extraFlags = builtins.toString [ "--disable" "coredns" diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index a95fa4a031e3..c120f461ddc9 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -24,7 +24,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ''; in { - name = "k3s"; + name = "${k3s.name}-single-node"; meta = with pkgs.lib.maintainers; { maintainers = [ euank ]; }; @@ -38,7 +38,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: services.k3s.enable = true; services.k3s.role = "server"; - services.k3s.package = pkgs.k3s; + services.k3s.package = k3s; # Slightly reduce resource usage services.k3s.extraFlags = builtins.toString [ "--disable" "coredns" diff --git a/nixos/tests/maddy.nix b/nixos/tests/maddy.nix index b9d0416482da..800d254f1770 100644 --- a/nixos/tests/maddy.nix +++ b/nixos/tests/maddy.nix @@ -9,6 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { hostname = "server"; primaryDomain = "server"; openFirewall = true; + ensureAccounts = [ "postmaster@server" ]; }; }; @@ -50,7 +51,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.wait_for_open_port(587) server.succeed("maddyctl creds create --password test postmaster@server") - server.succeed("maddyctl imap-acct create postmaster@server") client.succeed("send-testmail") client.succeed("test-imap") diff --git a/nixos/tests/multipass.nix b/nixos/tests/multipass.nix new file mode 100644 index 000000000000..0980e9195f5a --- /dev/null +++ b/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/nixos/tests/musescore.nix b/nixos/tests/musescore.nix index ac2f4ba74c0f..6aeb0558a49d 100644 --- a/nixos/tests/musescore.nix +++ b/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/nixos/tests/nebula.nix b/nixos/tests/nebula.nix index 372cfebdf801..89b91d89fcb3 100644 --- a/nixos/tests/nebula.nix +++ b/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/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 350486e8c733..b8d3ba75b51a 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -26,4 +26,4 @@ foldl }; }) { } - [ 24 25 26 ] + [ 24 25 ] diff --git a/nixos/tests/opensearch.nix b/nixos/tests/opensearch.nix new file mode 100644 index 000000000000..c0caf950cb9c --- /dev/null +++ b/nixos/tests/opensearch.nix @@ -0,0 +1,52 @@ +let + opensearchTest = + import ./make-test-python.nix ( + { pkgs, lib, extraSettings ? {} }: { + name = "opensearch"; + meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; + + nodes.machine = lib.mkMerge [ + { + virtualisation.memorySize = 2048; + services.opensearch.enable = true; + } + extraSettings + ]; + + testScript = '' + machine.start() + machine.wait_for_unit("opensearch.service") + machine.wait_for_open_port(9200) + + machine.succeed( + "curl --fail localhost:9200" + ) + ''; + }); +in +{ + opensearch = opensearchTest {}; + opensearchCustomPathAndUser = opensearchTest { + extraSettings = { + services.opensearch.dataDir = "/var/opensearch_test"; + services.opensearch.user = "open_search"; + services.opensearch.group = "open_search"; + system.activationScripts.createDirectory = { + text = '' + mkdir -p "/var/opensearch_test" + chown open_search:open_search /var/opensearch_test + chmod 0700 /var/opensearch_test + ''; + deps = [ "users" "groups" ]; + }; + users = { + groups.open_search = {}; + users.open_search = { + description = "OpenSearch daemon user"; + group = "open_search"; + isSystemUser = true; + }; + }; + }; + }; +} diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix index a85a508bfe16..e0dddf0ad29e 100644 --- a/nixos/tests/pass-secret-service.nix +++ b/nixos/tests/pass-secret-service.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "pass-secret-service"; - meta.maintainers = with lib; [ aidalgol ]; + meta.maintainers = [ lib.maintainers.aidalgol ]; nodes.machine = { nodes, pkgs, ... }: { diff --git a/nixos/tests/pgadmin4-standalone.nix b/nixos/tests/pgadmin4-standalone.nix deleted file mode 100644 index 5aa17fcb5bb9..000000000000 --- a/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/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 2a2b5aaa2841..6a9ce6ceae29 100644 --- a/nixos/tests/pgadmin4.nix +++ b/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/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index c2ea399d65af..c9b234d2b609 100644 --- a/nixos/tests/podman/default.nix +++ b/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/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index 268a55701ccf..52c31dc21f10 100644 --- a/nixos/tests/podman/tls-ghostunnel.nix +++ b/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/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 08773120bc12..684df9c39246 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -13,7 +13,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: { name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + pkgs.lib.optionalString withNetworkd "Networkd"; value = makeTest { - name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + name = "${pkgs.lib.optionalString (!predictable) "un"}predictableInterfaceNames${pkgs.lib.optionalString withNetworkd "-with-networkd"}"; meta = {}; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 82af1af463d0..ef5fcc41476b 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ...} : let @@ -11,9 +11,9 @@ let }; # Only allow the demo data to be used (only if it's unfreeRedistributable). - unfreePredicate = pkg: with pkgs.lib; let + unfreePredicate = pkg: with lib; let allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ]; - allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; + allowLicenses = [ lib.licenses.unfreeRedistributable ]; in elem pkg.pname allowPackageNames && elem (pkg.meta.license or null) allowLicenses; @@ -31,7 +31,7 @@ in rec { name = "quake3"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ domenkozar eelco ]; }; diff --git a/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix index 9ee2d280fbbe..055ae7d1681f 100644 --- a/nixos/tests/systemd-cryptenroll.nix +++ b/nixos/tests/systemd-cryptenroll.nix @@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-cryptenroll"; meta = with pkgs.lib.maintainers; { maintainers = [ ymatsiuk ]; - broken = true; # times out after two hours, details -> https://github.com/NixOS/nixpkgs/issues/167994 }; nodes.machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix new file mode 100644 index 000000000000..36de5d988fdb --- /dev/null +++ b/nixos/tests/systemd-repart.nix @@ -0,0 +1,134 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + # A testScript fragment that prepares a disk with some empty, unpartitioned + # space. and uses it to boot the test with. Takes a single argument `machine` + # from which the diskImage is extraced. + useDiskImage = machine: '' + import os + import shutil + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name) + + subprocess.run([ + "${pkgs.qemu}/bin/qemu-img", + "resize", + "-f", + "raw", + tmp_disk_image.name, + "+32M", + ]) + + # Fix the GPT table by moving the backup table to the end of the enlarged + # disk image. This is necessary because we increased the size of the disk + # before. The disk needs to be a raw disk because sgdisk can only run on + # raw images. + subprocess.run([ + "${pkgs.gptfdisk}/bin/sgdisk", + "--move-second-header", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + ''; + + common = { config, pkgs, lib, ... }: { + virtualisation.useDefaultFilesystems = false; + virtualisation.fileSystems = { + "/" = { + device = "/dev/vda2"; + fsType = "ext4"; + }; + }; + + # systemd-repart operates on disks with a partition table. The qemu module, + # however, creates separate filesystem images without a partition table, so + # we have to create a disk image manually. + # + # This creates two partitions, an ESP mounted on /dev/vda1 and the root + # partition mounted on /dev/vda2 + system.build.diskImage = import ../lib/make-disk-image.nix { + inherit config pkgs lib; + # Use a raw format disk so that it can be resized before starting the + # test VM. + format = "raw"; + # Keep the image as small as possible but leave some room for changes. + bootSize = "32M"; + additionalSpace = "0M"; + # GPT with an EFI System Partition is the typical use case for + # systemd-repart because it does not support MBR. + partitionTableType = "efi"; + # We do not actually care much about the content of the partitions, so we + # do not need a bootloader installed. + installBootLoader = false; + # Improve determinism by not copying a channel. + copyChannel = false; + }; + }; +in +{ + basic = makeTest { + name = "systemd-repart"; + meta.maintainers = with maintainers; [ nikstur ]; + + nodes.machine = { config, pkgs, ... }: { + imports = [ common ]; + + boot.initrd.systemd.enable = true; + + boot.initrd.systemd.repart.enable = true; + systemd.repart.partitions = { + "10-root" = { + Type = "linux-generic"; + }; + }; + }; + + testScript = { nodes, ... }: '' + ${useDiskImage nodes.machine} + + machine.start() + machine.wait_for_unit("multi-user.target") + + systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service") + assert "Growing existing partition 1." in systemd_repart_logs + ''; + }; + + after-initrd = makeTest { + name = "systemd-repart-after-initrd"; + meta.maintainers = with maintainers; [ nikstur ]; + + nodes.machine = { config, pkgs, ... }: { + imports = [ common ]; + + systemd.repart.enable = true; + systemd.repart.partitions = { + "10-root" = { + Type = "linux-generic"; + }; + }; + }; + + testScript = { nodes, ... }: '' + ${useDiskImage nodes.machine} + + machine.start() + machine.wait_for_unit("multi-user.target") + + systemd_repart_logs = machine.succeed("journalctl --unit systemd-repart.service") + assert "Growing existing partition 1." in systemd_repart_logs + ''; + }; +} diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 37bb649889b4..3eda8b6cfb20 100644 --- a/nixos/tests/vscodium.nix +++ b/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/nixos/tests/wireguard/snakeoil-keys.nix b/nixos/tests/wireguard/snakeoil-keys.nix index 55ad582d4059..c979f0e0c8a9 100644 --- a/nixos/tests/wireguard/snakeoil-keys.nix +++ b/nixos/tests/wireguard/snakeoil-keys.nix @@ -6,6 +6,7 @@ peer1 = { privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg="; - publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI="; + # readFile'd keys may have trailing newlines, emulate this + publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=\n"; }; } diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix index affa081bcc35..3407361d2824 100644 --- a/nixos/tests/zram-generator.nix +++ b/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/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix index e912c7fa49a4..179c656968ce 100644 --- a/pkgs/applications/audio/aether-lv2/default.nix +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { lv2 libX11 libGL libGLU mesa ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + "-Wno-error=stringop-overflow" + ]; + installPhase = '' mkdir -p $out/lib/lv2 cp -r aether.lv2 $out/lib/lv2 diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 6ed488d7d643..a57f43eea651 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/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/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index b58dbddc811f..15db4c1cf03d 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/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/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 276b3d6c7bc2..e48e27b5cc69 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/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/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 3051dc7ceb82..ed421277f9d0 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.9.2"; + version = "unstable-2023-01-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; - rev = version; - hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8="; + rev = "0623386c813d0d68564002324958cef7217cec7f"; + hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY="; + hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso="; }; postPatch = '' diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 08e347911924..0cb33062bd0e 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/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/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 6c48c756ab24..7fc921e59fbf 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include ' -i Source/TitleBar.h # gcc12 + ''; + cmakeBuildType = "Release"; cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ab651e3fb84..b4c9781ced19 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; + outputs = [ "out" "doc" ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 562a53fe5927..221febf35dcd 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/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/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 0db9da5d2161..8a4ffab5dc1f 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , meson , ninja , pkg-config @@ -18,14 +18,15 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "knuxify"; repo = pname; - rev = "refs/tags/${version}"; - sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg="; + rev = version; + sha256 = "sha256-XvbfQtE8LsztQ2VByG2jLYND3qVpH6owdAgh3b//lI4="; }; postPatch = '' @@ -67,7 +68,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/knuxify/eartag"; + homepage = "https://gitlab.gnome.org/knuxify/eartag"; description = "Simple music tag editor"; # This seems to be using ICU license but we're flagging it to MIT license # since ICU license is a modified version of MIT and to prevent it from diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 2c59068720d0..7164cb5fd3e0 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -e s,/bin/ln,ln,g -i src/Makefile sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile - '' + (if portaudio.api_version == 19 then '' + '' + (lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h - '' else ""); + ''); configurePhase = '' cd src diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index be6e0fcca228..2350bde0bd6a 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; + sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls="; }; - patches = [ - # To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54 - (fetchpatch { - name = "CVE-2022-37781.patch"; - url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch"; - sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/flac2all/default.nix b/pkgs/applications/audio/flac2all/default.nix new file mode 100644 index 000000000000..e0681b94f683 --- /dev/null +++ b/pkgs/applications/audio/flac2all/default.nix @@ -0,0 +1,45 @@ +{ python3Packages, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "flac2all"; + version = "5.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI="; + }; + + # Not sure why this is needed, but setup.py expects this to be set + postPatch = '' + echo ${version} > ./flac2all_pkg/version + ''; + + propagatedBuildInputs = [ + python3Packages.pyzmq + ]; + + postInstall = '' + wrapProgram $out/bin/flac2all \ + --set PATH ${lib.makeBinPath [ + # Hard requirements + flac + lame + # Optional deps depending on encoding types + opusTools + vorbis-tools + ffmpeg + ]} + ''; + + # Has no standard tests, so we verify a few imports instead. + doCheck = false; + pythonImportsCheck = [ "flac2all_pkg.vorbis" "flac2all_pkg.mp3" ]; + + meta = with lib; { + description = "Multi process, clustered, FLAC to multi codec audio converter with tagging support"; + homepage = "https://github.com/ZivaVatra/flac2all"; + license = licenses.gpl3; + # TODO: This has only been tested on Linux, but may work on Mac too. + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 0f15775b38d5..f0bb039a79c4 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -63,6 +63,12 @@ stdenv.mkDerivation rec { "-DWARNINGS_ARE_ERRORS=ON" ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc) + "-Wno-error=mismatched-new-delete" + "-Wno-error=use-after-free" + ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index cf5ac3f8c52e..e08400220790 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,18 +10,18 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY="; + hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; }; deleteVendor = true; - vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo="; + vendorHash = null; subPackages = [ "cmd/musicfox.go" ]; diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index 7471a0afb4ca..f5b2cf5576e3 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-aJRVk9KFCJbIFInkg5BCJ6ygBlDCFF53WXO9qyACFus="; + hash = "sha256-55mS+hrhLLRkhgih5lvdM9Xka+WKg2iliFm6TYF6n3w="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildGoModule rec { install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-usnlaOqyMd8rdnFpuCqfaCES8bPaB+NbdL4pFybKJbM="; + vendorHash = "sha256-IQpokMeo46vZIdVA1F7JILXCN9bUqTMOCa/SQ0JSjaM="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 5e8747f76566..847096c38816 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877"; + sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 684f074b4e61..78891967fa41 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = pname; rev = version; - sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1"; + hash = "sha256-TvjO7fGobGmAltVHeXWyMtMLANdVWVGvBYq20JD3mMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY"; + hash = "sha256-W5Imlut30cjV4A6TCjBFLbViB0CDUucNsvIUiCXqu7I="; }; nativeBuildInputs = [ @@ -50,9 +50,6 @@ stdenv.mkDerivation rec { pipewire ]; - # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; - meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 420c11562e2a..8cf55289b2f3 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ]; - NIX_LDFLAGS = "-ldl -lm -lpthread"; + NIX_LDFLAGS = "-lm -lpthread"; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 70cb4d7f1109..36b6345c0f11 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = "-ldl"; - postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix new file mode 100644 index 000000000000..04216bdf09f6 --- /dev/null +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitea +, pkg-config +, stdenv +, openssl +, libiconv +, Security }: + +rustPlatform.buildRustPackage rec { + pname = "listenbrainz-mpd"; + version = "2.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "elomatreb"; + repo = "listenbrainz-mpd"; + rev = "v${version}"; + hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ="; + }; + + cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]; + + meta = with lib; { + homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; + changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; + description = "ListenBrainz submission client for MPD"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3ee546de223b..005bef77d456 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/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/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index dd00bd1f2c02..4e4612ef922c 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -4,19 +4,21 @@ , ladspaH, php, libXrandr }: stdenv.mkDerivation rec { - pname = "lsp-plugins"; - version = "1.2.5"; + pname = "lsp-plugins"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; - }; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; + }; - nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + outputs = [ "out" "dev" "doc" ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" + nativeBuildInputs = [ pkg-config php makeWrapper ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 7e11c0a8d75f..47e043f5d467 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { pcre2 ] ++ lib.optional pulseaudioSupport libpulseaudio; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=free-nonheap-object" + ]; + postInstall = '' wrapProgram $out/bin/mimic \ --run "export ALSA_PLUGIN_DIR=${alsa-plugins}/lib/alsa-lib" diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index 5a229f0ae348..ccbe14d76725 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE="; + sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk="; + cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 29f28203e138..3eb2cf20ee77 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mpg123"; - version = "1.29.3"; + version = "1.31.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec="; + sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94="; }; outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ]; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 88b5d3b74c15..652adb03b66a 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/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/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 573a78a92583..97f71a1b48f8 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/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/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch deleted file mode 100644 index 57a6092d5852..000000000000 --- a/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/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 706a36b5327f..35e86c28f6ce 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/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/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 0d10b55d3296..470d5c105075 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; buildInputs = [ eigen ffmpeg ]; - fixupPhase = if stdenv.isDarwin then '' + fixupPhase = lib.optionalString stdenv.isDarwin '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib - '' else ""; + ''; meta = with lib; { homepage = "https://www.musly.org"; diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index beb126467935..de89f9aedead 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; + postPatch = '' + sed '1i#include ' -i \ + libs/JUCELV2/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 0860501c87c4..71fc1f103b9b 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -1,4 +1,4 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: buildNpmPackage rec { pname = "open-stage-control"; @@ -71,7 +71,7 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Libre and modular OSC / MIDI controller"; diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh deleted file mode 100755 index 30f1b4c293f1..000000000000 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts jq nodejs -set -euo pipefail - -# Find nixpkgs repo -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true -} - -findpath() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}" -version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" - -pkgpath="$(findpath "$attr")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -# Update FOD hash -curhash="$(nixeval "$attr.npmDeps.outputHash")" -newhash="$(vendorhash "$attr.npmDeps")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New npmDepsHash same as old npmDepsHash, nothing to do.' -fi diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index f86595361b65..47d7a64e3c20 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus, fetchpatch }: stdenv.mkDerivation rec { pname = "opusfile"; @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; outputs = [ "out" "dev" ]; - patches = [ ./include-multistream.patch ] + patches = [ + ./include-multistream.patch + (fetchpatch { + name = "CVE-2022-47021.patch"; + url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch"; + sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ="; + }) + ] # fixes problem with openssl 1.1 dependency # see https://github.com/xiph/opusfile/issues/13 ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ]; diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix new file mode 100644 index 000000000000..071a4468434c --- /dev/null +++ b/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/pkgs/applications/audio/pianotrans/default.nix b/pkgs/applications/audio/pianotrans/default.nix index 89e0716a0adc..e5848de03dac 100644 --- a/pkgs/applications/audio/pianotrans/default.nix +++ b/pkgs/applications/audio/pianotrans/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pianotrans"; - version = "1.0"; + version = "1.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "azuwis"; repo = pname; rev = "v${version}"; - hash = "sha256-6Otup1Yat1dBZdSoR4lDfpytUQ2RbDXC6ieo835Nw+U="; + hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index df008d1cfb33..553ceb8be95a 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/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/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 528cc18cbe46..576124d96844 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/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/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 519f59a1d89d..a00f60e73286 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.05"; + version = "6.3.08"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; + sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo="; }; configurePhase = '' diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 705820950b0d..128d5c59c78e 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' chmod 555 $out/bin/puddletag + wrapQtApp $out/bin/puddletag ''; doCheck = false; # there are no tests diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 542e47cd16b7..57a6bff6e2ae 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.73"; + version = "6.75"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-omQ2XdL4C78BQRuYKy90QlMko2XYHoVhd4X0C+Zyp8E="; - aarch64-linux = "sha256-XHohznrfFMHHgif4iFrpXb0FNddYiBb0gB7ZznlU834="; + x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck="; + aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 9fce777906bb..807a27e67e1a 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/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/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 558948ab4a0d..aef561e692a6 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/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/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 38110df29157..d7b15ba0482a 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -3,17 +3,25 @@ , appimageTools }: -appimageTools.wrapType2 rec { +let pname = "sonixd"; version = "0.15.3"; - src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; extraInstallCommands = '' - mv $out/bin/sonixd-${version} $out/bin/sonixd + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index b15031a52914..93a66559bc9a 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/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/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2c821ec6b4c8..a0a17a93e1fa 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -134,8 +134,8 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir" diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 84376a1bbe9e..2b72664347e6 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include ' -i \ + lib/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index d6e56c98125f..db7851d9e154 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.7"; + version = "7.5.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0="; + hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc="; }; postUnpack = '' diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 69004bb73c3f..9b88cf9ab4ba 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.5"; + version = "1.7.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; + sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 8a05f8276b3f..3193a302d1a6 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/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/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix index e7b92b268a64..59f927443b7b 100644 --- a/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ + anyio (toPythonModule chia) pytest # required at runtime by the "test" command pytest-asyncio diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 99fe1595def1..a07a0ea1e281 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; + hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index a39cbc341e89..80fa1e94589f 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "22.0.2"; + version = "22.1"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU="; + sha256 = "sha256-HDV06O9k+TpYR0ZwLas2hvDwxvnfoa8VUzgvkXv/WV8="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index a17bef8cae37..51b6d4d16b2b 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/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/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d64376aae18d..5aee9eaee9fe 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.51.0"; + version = "2.53.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-qpgzGJsj7hrrK2i+xP0T+hcw7WMlGBILbHVJBHD5duo="; + hash = "sha256-RGeJWUMZagXM/8SHHOpTpcnsz+BShnGp2yvt31qo5lI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 08def5dd7917..debf89c617c7 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.57"; + version = "2.3.62"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; + sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 4931ec51078c..b58c6bddafa0 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/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/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 8f3fd4b1c886..9d984803d219 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.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/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix index cf7722238ef7..657e5b0e3ffa 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -1,20 +1,42 @@ { lib , buildGoModule +, buildNpmPackage , fetchFromGitHub }: -buildGoModule rec { +let pname = "torq"; - version = "0.17.3"; + version = "0.18.17"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; + hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM="; }; - vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + web = buildNpmPackage { + pname = "${pname}-frontend"; + inherit version; + src = "${src}/web"; + npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM="; + + # 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-bvisI589Gq9IdyJEqI+uzs3iDPOTUkq95P3n/KoFhF0="; subPackages = [ "cmd/torq" ]; @@ -24,6 +46,11 @@ buildGoModule rec { "-X github.com/lncapital/torq/build.version=v${version}" ]; + postInstall = '' + mkdir -p $out/web/build + cp -r ${web}/* $out/web/build/ + ''; + meta = with lib; { description = "Capital management tool for lightning network nodes"; license = licenses.mit; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 5c2a6d7c59b0..53f004c2a367 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; - postUnpack = if conf != "" then '' + postUnpack = lib.optionalString (conf != "") '' cp ${builtins.toFile "config.h" conf} source/config.h - '' else ""; + ''; buildPhase = '' mkdir -p $out/bin $out/share/xgreeters diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 494a02f3041f..664199553ddf 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" - sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; + version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1" + sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4="; }; betaVersion = { version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 7af47c46485a..f7af76206976 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.176.0"; + version = "1.184.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-7J/FAcmZYmgbmYEFm2V3+RBUcLE+8A+yOiJd/xp2Aww="; + hash = "sha256-bRe9yS9CMsBH04oefImSYkd1jUe3SnJU6JZETLwow/0="; }; postPatch = '' @@ -66,8 +66,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' - ln -s ${dep} ${name} + cp -r ${dep} ${name} '') deps) + '' + # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText + substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ + --replace GTK2_IME_CODE _GTK2_IME_CODE + lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 4ae432b946a7..7cbb440491ef 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,8 +1,8 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2022.06.19", - "hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" + "rev": "2023.01.02", + "hash": "sha256-4/ih4sBDel2wm+YFpNcwHoOrK8AgHe3Jbqxl+CYrQFM=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-2Q1azfhThrk1t65Q+2aRr00V0UFrvR+z5oVMeW9c2ug=" + "rev": "2023.02.05", + "hash": "sha256-ZOnIhUnFd+7mBEz6YIhUOQkhBbCNeTFD0tfUILuC1x4=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-rgXVOWmmc1ap/fCiXCvn34rhUbNRoMHbTXXYtnxk2pQ=" + "rev": "2023.02.12", + "hash": "sha256-PSRKxKJkX9GlV8JUACYzDZguv8M8jKVxlW7U4Mmla9o=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,18 +26,18 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.08.22", - "hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4=" + "rev": "2023.01.18", + "hash": "sha256-5R4ZHMTfmIF0VnwOFNOV/i6Dc91yk5dVNcFNrxMMzm0=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.09.03", - "hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew=" + "rev": "2023.01.18", + "hash": "sha256-SLZIDcrLwvhkJY92e/wtSsoY5SrjghcumbdpuVdK4iE=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2022.10.26", - "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY=" + "rev": "2023.01.02", + "hash": "sha256-NnPrQAqmKg3Lh16Qp/LZVS4JRtAxXi3qRovLTbzUyYQ=" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.2", - "hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8=" + "rev": "v11.5.3", + "hash": "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8=" } } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a57a3901f63a..a0b0fa56de15 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/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/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index f5ed28cedf68..b7b70eb501ea 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; + hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index d3c3d5890858..6ce924adf11c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -194,6 +194,13 @@ let stripDebugList = [ "share" ]; }); + epkg = super.epkg.overrideAttrs (old: { + postPatch = '' + substituteInPlace lisp/epkg.el \ + --replace '(call-process "sqlite3"' '(call-process "${pkgs.sqlite}/bin/sqlite3"' + ''; + }); + erlang = super.erlang.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ pkgs.perl diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index feed7ba5b41e..499da2a8f93e 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -60,7 +60,7 @@ assert withPgtk -> withGTK3 && !withX && gtk3 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (lib.optionalAttrs nativeComp { +(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { @@ -69,7 +69,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation patches = patches fetchpatch ++ lib.optionals nativeComp [ (substituteAll { - src = if lib.versionOlder version "29" + src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch else ./native-comp-driver-options.patch; backendPath = (lib.concatStringsSep " " @@ -241,7 +241,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation passthru = { inherit nativeComp; - pkgs = recurseIntoAttrs (emacsPackagesFor emacs); + pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; }; @@ -269,5 +269,4 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation separately. ''; }; -}); -in emacs +})) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 2518b6bd7d99..d04e2507c917 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.5"; + version = "43.6"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o="; + sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; }; patches = [ diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 23734f3f23cd..83d6796e6847 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/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/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 29749c35db1f..8a4e86ef6551 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/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/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 8f4bcfd67263..fba050a040cf 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -80,13 +80,13 @@ in stdenv.mkDerivation rec { moveToOutput share/vim "$out" ''; + # Prevent tclPackageHook from auto-wrapping all binaries, we only + # need to wrap poke-gui + dontWrapTclBinaries = true; + postFixup = lib.optionalString guiSupport '' wrapProgram "$out/bin/poke-gui" \ --prefix TCLLIBPATH ' ' "$TCLLIBPATH" - - # Prevent tclPackageHook from auto-wrapping all binaries, we only - # need to wrap poke-gui - unset TCLLIBPATH ''; passthru = { diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 09b5a7665d32..4f601a56f8ba 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.142.1", + "version": "3.148.0", "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.148.0/standard-notes-3.148.0-linux-x86_64.AppImage", + "hash": "sha512-Nzvzl3O7/AXj/Sr5CMfmLktx+w9OUHPZmHH8pxx5GYhmjAgYCh2V0w1iPe5G7/nJpx+jSBJXSKq3jR3wYCeXWA==" }, "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.148.0/standard-notes-3.148.0-linux-arm64.AppImage", + "hash": "sha512-Owwc0WRlATTYZYrUtW6iZK8gXktHstDclqHmo5GZ1AAqB7/W9qTuQ2LNMjfL0kAzIQw/JCBfxvDCG9DjEM6eYA==" } } } diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index e52d95f837df..82dd13920b02 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -27,18 +27,18 @@ rec { postPatch = (if tex == null then '' gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) - '' else if extraFonts then '' + '' else lib.optionalString extraFonts '' gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if chineseFonts then '' + '') + + (lib.optionalString chineseFonts '' gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if japaneseFonts then '' + '') + + (lib.optionalString japaneseFonts '' gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if koreanFonts then '' + '') + + (lib.optionalString koreanFonts '' gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) - '' else ""); + ''); meta = { diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 96fb32e80f36..d162261116c0 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/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/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 71af02bee7dd..8683facf2966 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-01-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; - sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; + rev = "3f6fd348df53b9d15aa0a58709562cf0a3b4636a"; + sha256 = "1dyxlam666wvydhmpxvyli3j7immifmw8yb1fyxhdrllivnrkd00"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2023-01-27"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "564a64651578164b5c7f2503e306bc436beb88da"; - sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1"; + rev = "9aefe2af9230e8e5aa43ed1faade069da0721b66"; + sha256 = "0pl7qnzxxnzlyzvjwa0p828wx1m69b3qmixdzl18ix4c3g1wakf4"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -101,12 +101,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2022-09-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "70a9516a64668cbfe59f31b66d0a21678c5e9b12"; - sha256 = "1np58km2jq26d23rq1szi7v3xnfw63r6hwk263fnf38sr2q6v9cg"; + rev = "1900f89dc17c603eec29960f57c00bd9ae696495"; + sha256 = "0p7xh31qp836xvxbm1y3r4djv3r7ivxhx7jxwzgd380d029ql1hz"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-12-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "43433aa8dad1601acf923d3c25fa3325799508aa"; - sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci"; + rev = "86db2ec0d332c125c6c7d726721c613380978e2e"; + sha256 = "0rp1fhsr0l4986nm6a96nw0612y2xa1d4ckkjxg7ca2nab6q24wj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -257,12 +257,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2015-08-14"; + version = "2022-09-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "efa491f6121f65e025f42d79a93081abb8db69d4"; - sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s"; + rev = "e61319bce3cd1004e5b695933296d8f267dd65a3"; + sha256 = "0hnww4a0vffgpj72qdhhsr28xdh219haldr6jd6my8mqy1rg3yq4"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-02-03"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "bb952ae19d2b227b549133a3b0ed69a3436d208e"; - sha256 = "0lg5ibn3q1kw951k7j11f7c24qmf4sy9y3y2pqlpvk9bvc095jyl"; + rev = "a4798a9fb5fd3ac8e132065597b397cab347d3ca"; + sha256 = "0al1dri6yv3n7a0xdf5lln6dvq4h5zqlxmyc1lgii260kk7zirgq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; - sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; + rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; + sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-02-03"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4428a478e70f6a6b52e86d16ced677020267f409"; - sha256 = "18dvm2k6h0xvzhf6wr317b9j85qq46gkh2scxmi8b20p8d3kfi52"; + rev = "89031be806abded509a7bafd99bd9944eb5108a5"; + sha256 = "1xg7ja016qq2r7x22rh77rbjx2qhfyh6bx1px9d8gsgy4zxnr0pg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-02-03"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "45a3e3f574172028338de70ce8f8f606dec0a1b0"; - sha256 = "0xyglfdqr8bq4s5mqq7wvj8czl1n9pgs16368q2zjj9j35x6m8xr"; + rev = "c3f9bccb8c04b01d5d0712b8691658af0b0ddb16"; + sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-29"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; - sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; + rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; + sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-02-02"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1"; - sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2"; + rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e"; + sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -775,24 +775,24 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "c8b2f4048f846387361bd04cc185bf1aa7d2e3d1"; - sha256 = "0z02981n9gd5migx774cs4gnwpq9ksd4ava53f4xn973gc8jf4jn"; + rev = "04ccdac802200ecc363b251cf922b2b022bb515c"; + sha256 = "02xvdvy0jakpbgkp33ll21rcqpiybngwgxjsvvw6wg4wqg8dzykv"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177"; - sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m"; + rev = "08b362ba12af1053871b192614b627bcb3c5299d"; + sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -847,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-30"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812"; - sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh"; + rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; + sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ed0a85f5212124cafb611af8365c162b64e4064d"; - sha256 = "05ya1zpg86w6q9r1s3i8bm42hw5h612aa2jghl34j7z7pdwcy3ns"; + rev = "c6cb480f397d19f73cf2ff491c547d751118dbae"; + sha256 = "0xlqmz0mg9h531a7667sxpr9q1nff525jjyw4fz07xwfs8q47wxr"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -919,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-01-09"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; - sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; + rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; + sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -991,12 +991,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-12-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; - sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; + rev = "8933abc09df6c381d47dc271b1ee5d266541448e"; + sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1027,12 +1027,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-12-24"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c7492a76ce8218e3335f027af44930576b561013"; - sha256 = "18vfx8mq2gsv2hqy0c0vgbmx5mhr63bb8ixrmzmjgvbx2djz1jdb"; + rev = "84b0822b2af478d0b4f7b0f9249ca218855331db"; + sha256 = "0q6y91wpg0znzmr188hk20llaz6cdpbsw0fiazacfj0y5pkgid6w"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-02-02"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "6004885c90fd0239b84ce242babbcfe7cd379535"; - sha256 = "0avpcl9y718xldlhc6ip8hq6y6wp50k4hqdfrm3zg1z6l7iladwh"; + rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; + sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1231,24 +1231,24 @@ final: prev: cmp-clippy = buildVimPluginFrom2Nix { pname = "cmp-clippy"; - version = "2021-10-24"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "vappolinario"; repo = "cmp-clippy"; - rev = "9f8dd021f7b9326407a439105b0c646983191a49"; - sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + rev = "eb501c9fa429c5852f8f420e71a9f565f4852c8f"; + sha256 = "1l07fvfc37sp531rjzpajf90dprcnylrkj9prr6qrgr1xlxqsvwh"; }; meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-27"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; - sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; + rev = "8fcc934a52af96120fe26358985c10c035984b53"; + sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1315,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "8b5acfbc79eea0bfe2c08ffeb8f137f13449ab56"; - sha256 = "18j7rdq32xmmdh2bazfyv1q0d37ravz8x9brm8v1z9gracbly43a"; + rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; + sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1363,12 +1363,12 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-22"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "471949d19b1246f069eaf50729b39231eab3221b"; - sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; + rev = "21d281de0fda5bf4f57920f54eb60e212593ba63"; + sha256 = "1794rhyf0sjwzw3hbzxv53vispifyxxxp1niv6zw4bmrks3jxdg8"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; @@ -1387,12 +1387,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-01-09"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; - sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; + rev = "191ec4788656c3d1ad59c9edc3d96e132f93e039"; + sha256 = "0ln32vw0kqjfc8m4qn963f656hivg3v275dj0xqis25pcdwqpidg"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1447,24 +1447,24 @@ final: prev: cmp-npm = buildVimPluginFrom2Nix { pname = "cmp-npm"; - version = "2021-10-27"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "cmp-npm"; - rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29"; - sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222"; + rev = "e5753b6103ce4cf887233142fa9f31b2d13b42f2"; + sha256 = "1hcl7ch38pnjsjnpvrqmfghikaps80aykxbn63xm8wrdqa7rxph3"; }; meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-11-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "59224771f91b86d1de12570b4070fe4ad7cd1eeb"; - sha256 = "1m8xs7fznf4kk6d96f2fxgwd7i5scd04pfy2s4qsb5gzh7q2ka9j"; + rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef"; + sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-01"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "80858aa01d57ed2f93c6bc388bad373810d41a21"; - sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9"; + rev = "b8aacc44913b4b8de089d067ef6f103512e76e18"; + sha256 = "10hdrw4yzadggaaz4x3vjpmk8jnalcprp8sn550mxy95al1ip4q8"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1891,12 +1891,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-01-18"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "eab2c83a0207369900e92783f56990808082eac2"; - sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; + rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43"; + sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1963,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-25"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7"; - sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf"; + rev = "26009c1d6265a6b6e86d8e74a81a235892f67e87"; + sha256 = "0g2b0mxssx6sjmn2iqlipwj50jmw8hfq648xcg3f78phmn03b4s4"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2095,48 +2095,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683"; - sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr"; + rev = "5304ea7079f38df200f4357401f1510fd00560a8"; + sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-02-01"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "c7d166ebda265370f38cec374e33f02eeec2f857"; - sha256 = "1j2q62sac9gwcdzgc2cdxvvpxjgxi12sy33p49lk3gh5mlld53ij"; + rev = "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b"; + sha256 = "0jzk1hd8kvh8bswdzbnbjn62r19l4j5klyni7gxbhsgbshfa3v87"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-29"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "53513efa7cc878ae7929ec6a389028effa569441"; - sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw"; + rev = "6acfe02d3b8057ed9ed5bbd02b1ecc426eb9d97d"; + sha256 = "16rmmmh34y2pz1iwk8mnk88vs5cdqrm0sw52fnsmg5r82wy1i7y7"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-29"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14"; - sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps"; + rev = "0b93c482acfc0bcdd760ff431b4d338e19395776"; + sha256 = "0hns2zvxlxd9wpdkr5cvcgzms6vkcw3h9p8ck1zj6msh0w1pmg67"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-02-03"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "67b7623184406dda85ae0ea678cb82a6f2a509d0"; - sha256 = "0gzna1qyialp6b4iap9jnfhf3w7anp7xlg6hdal2r0i60h9f0igm"; + rev = "49189b020236002bae41f823da9ac0f73dca873f"; + sha256 = "17rmg7b9ibx1d8bb8s9r9zxqxxh206hkb5avykrdbngrg1sy64y6"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-02-02"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "1bca9122ddc4bf4c6573402bf6686fc084470a7e"; - sha256 = "0isvyph3lpqpijxpfj5rjfh1w1mh3629jpyahy5sj2g8hn46mj08"; + rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; + sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "5d7b14dfa88a32040647649b1e714051235bfd32"; - sha256 = "1iknwbwiq2rykf36vr3agdzlyb54mkppjywh4qdgqgach71016l3"; + rev = "2312a5024748e869a355d91170f2e8fbf2bd5a51"; + sha256 = "1sg2c2238m6nrmp700b2wvw9g9p1wfc7d1v4ma0lam4d1z0xhwyj"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2685,12 +2685,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-30"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "ab3757c1ea1b84ef59f7dda54f11d10022e0e3b7"; - sha256 = "1rbcf3llcq542533l0cxqf3bwnzk99x76k9yclfdy12zfdcjx4fv"; + rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; + sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2733,24 +2733,24 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-01-19"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; - sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; + rev = "798274ba3c454a9aa3cd71f95a86ea55cbbbb142"; + sha256 = "156g08ab9jghi580b1k88si3bc6h72d77avlpn34dnnn5481anvh"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-12-13"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c"; - sha256 = "1iwxqfqp3x09wz3rnvli3y80n38rw149cmjj9pmbkhiqgsm9p461"; + rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; + sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2781,12 +2781,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-25"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84"; - sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13"; + rev = "1d54632f7fcad38df8e428f349bc58b15af4b206"; + sha256 = "1692rzbv64332wi0cmyf0g5m8k039vvrijxmryrqnxaf15493mbw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2939,12 +2939,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-01-15"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "4841c8830f0354808952fd4f64869383413c194f"; - sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; + rev = "1856f0390b1ae15d446b94dc47ccf5b967537ad1"; + sha256 = "06c54lhn30ibn721l6vh5gx4kdyrk39w2kkcwrlhskpx6dipava5"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2963,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-11-27"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; - sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; + rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; + sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2987,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-31"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "35b34ba566d9d9f6761cde3574f668d505c5137f"; - sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm"; + rev = "07652ec0b659cba53e5dc07eeb660234a7b248ee"; + sha256 = "1w3l0byhnk873c9qfyp4gna96aff37769l82jqwdcvs7a2dalsz3"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3012,12 +3012,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2022-10-14"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "be110f9814a45788d10537fd59b3c76d956bb7ad"; - sha256 = "1innhwy2izcw2w7qhp6x7s3q07zy0zxfwqmlqskgl6c75r4akqyn"; + rev = "980e80e8fe44caaeb9de501c8e97a559b17db2f4"; + sha256 = "1aw5455gin4ki3sn2ml38acqi2w94mhbx37pkajfbb5bfagdpdb0"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3060,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-02-02"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "f84836a906fac21e9fb096ce15478051cd7df589"; - sha256 = "1j725v2cf9k1dlxnpmzcz1ys7v9iyj0vyvjw9bkmjvy17hqcrxaw"; + rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; + sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-26"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7"; - sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16"; + rev = "1645e7cd98ed99e766c84ab3cf13a1612c77dcee"; + sha256 = "13zvkv7vnfrj0xs31s1gv74amxpdyvc2m2x8br58vxfscy3wbaa4"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-02"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1"; - sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f"; + rev = "52f0cfd8021404988dc446734711f215bba6a6de"; + sha256 = "0ypidlvf3fc5nq4s9qz9w7378zzppv7qajwydm84v3g76p1aqm3a"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3252,12 +3252,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "8abf42d2035374df1c87cb1b26039393c807ddd5"; - sha256 = "1vka4b9qs54wrs2wzk8msbpadc01wc5b1py0zng8hq67dplcg9yx"; + rev = "8340095e5a8263494abadf5a81970ff92091e004"; + sha256 = "0glp8nnj9jsps465srn59bdc6g5pnyrs3n9kxghp0wzf8hrx2zic"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3300,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-01-14"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; - sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; + rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; + sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ec4742a7eebf68bec663041d359b95637242b5c3"; - sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz"; + rev = "f388995990aba04cfdc7c3ab870c33e280601109"; + sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3384,12 +3384,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-30"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "3b7fbbe4e785bedbdaa1a9573dcd800261a7e32b"; - sha256 = "09jcq6315njcw0khasnv41vi0lscbxk07cajzxqbm5pgjzww26fq"; + rev = "24b367dc1678ad3d23b26396a8e06363b32facbe"; + sha256 = "1x33hn6lk4jlq7h7ss3b29105kbs0l5f2zykn9d9n6rvl5qwdmw1"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3408,12 +3408,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-29"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c87b1120b618577e64d910a7493a26829044a8a2"; - sha256 = "1i5d249jga0slnwnk6as1zqlc03x8nxd0vbrxr43qg6vw322sj7k"; + rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; + sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3540,12 +3540,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-26"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "2e93ac50b3e95d650e62729f8810a005861e77ad"; - sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h"; + rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; + sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3588,11 +3588,11 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2023-01-30"; + version = "2023-02-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "92e8a80edc11ad5df6fdcfccee567515027682eb"; - sha256 = "10fl95n5c2yk8v00hr4r4zbbi4rrdhbz6jg7r86d8jw6qjxl6c1b"; + rev = "75874719e1aee0171a0f06d1508ff9a116f6ac75"; + sha256 = "0n2rh59nnp0fv4jxvx30arrrqpfbagix6a94rxq3100n8kszr218"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -3611,12 +3611,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-02-03"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2"; - sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa"; + rev = "b4a4046d4910b4e7f42de30765ea78c888919757"; + sha256 = "12sl1yxib33pcpz38yxm8shhw71xkiw1ywlxxv1inph5avsy0ylk"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3659,12 +3659,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-01-30"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "81ceb3025e6c7030c42accc3951dad94f31ff0c8"; - sha256 = "0m8z7k0pw7vmwmw21lcil0iprdb9l9yfx4yjk05h65027j8xhk7c"; + rev = "b2e69dc3385772159b5dffd3a12a7af874692e10"; + sha256 = "11c5ng73vh9m29g4i3y4pc05pnblb90yggbh96vw5hkkvv0ahg9s"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -3683,11 +3683,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-09"; + version = "2023-02-15"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + rev = "64fb17067cf5dbf5349726b9ed1b1b38065cdb82"; + sha256 = "13d5vs35bmzr4dj2anj2k7scmx647ddsyz941sjaajsyff37bvsv"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3742,12 +3742,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-12-02"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e"; - sha256 = "0cbw07w65kmp1w2l2k4vbnv10vhpj30ija14mdn8mfbqwbp8pb2j"; + rev = "9fd5d6e341861c776ec9c69a2fc524deae67b541"; + sha256 = "0cysw3852wgnaahw1fwbmq72m0pi4yqf9r1kqi4gzim1fva7sy61"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3766,12 +3766,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2023-01-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "d00274f05363c13f29ed1fa571026a066a634cce"; - sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; + rev = "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0"; + sha256 = "1dwhi2543drbncrqx80nsi5hw48d6my4wbsp71gx6m0clkp4469h"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3884,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-02-13"; + src = fetchFromGitHub { + owner = "Darazaki"; + repo = "indent-o-matic"; + rev = "f4138581fe4575b720eae2d123cbaed0d86c94cf"; + sha256 = "1n4vdpfhy8lga2d508ixi7mwa12rd8zk37ms43d4vrjff0v35nd5"; + }; + meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2022-09-07"; @@ -4163,12 +4175,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-02-01"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693"; - sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd"; + rev = "7339145a223dab7e7ddccf0986ffbf9d2cb804e8"; + sha256 = "0mw9sxnmyc5wipw7m1ap1s1f1a7mfi2qi9d2ibfibbrwbpx5n0yz"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4223,24 +4235,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-02"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "6068651f7f2bdb379344de52b9833d82bce27cec"; - sha256 = "0skyq97hzslpx3w5y6ikcqbblzn1yqfwmk1wxrrmwayvyfcqqh9j"; + rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; + sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-01-06"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3008ed68c8f309ced07587684c8af53884791d35"; - sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z"; + rev = "9e38951df410c6d65fa2b932832d201d7cd6ca62"; + sha256 = "14sw0xaf7qr9896hcl9vb5ivmc6w15p1np0gqnyhjqbmcqj20yp8"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4259,12 +4271,12 @@ final: prev: lessspace-vim = buildVimPluginFrom2Nix { pname = "lessspace.vim"; - version = "2019-09-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "thirtythreeforty"; repo = "lessspace.vim"; - rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; - sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; + rev = "2f3e60d79501026b78b593e8a12749ef1220dd61"; + sha256 = "1ggm78rrql668xl3ggybmi14i31a4jxcvq9bncm79mx1by2n694n"; }; meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; @@ -4307,12 +4319,12 @@ final: prev: lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-08-18"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "aa8e8f270c1d3be4fbe6b153827a191a5fcaa0d7"; - sha256 = "0lgpxgg2696pbfdgnr2zcapvhfk6d1qwvci223h69rvg0fh853rz"; + rev = "02764e0e87f85fa13e0d6a0e38ac6605f806d560"; + sha256 = "0d4hs4qh4fm393f1k6085l1f8yvqjpr2wdh7ia26k9839s4k2pn0"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -4415,12 +4427,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-01-25"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "3aa6c2029499625dc76911cb007e9cd370137f11"; - sha256 = "1pbpssf24zam4py6wg5k2m7hadivlsv25yvm4gxr0cnn79fv5cqp"; + rev = "248f6b1da1f597e51513dd970672c7e57253f92a"; + sha256 = "0l5xx5n1vzghpp85x7ilw53qz1jcjmm5xjkiiwlg6bpb6shrlnyn"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4535,12 +4547,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-12-04"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; - sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; + rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; + sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4571,12 +4583,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-31"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "42bc5a1081666098a7154532e6ff5e3edc483b39"; - sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck"; + rev = "4361fbcb9e56ecd22169865a6588db8b1764c06c"; + sha256 = "0kac8cc30j8w0d0417wsjdib9jiqbdyavhg34hn0sl3kwyp92nc4"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4666,24 +4678,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2023-01-11"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0050b308552e45f7128f399886c86afefc3eb988"; - sha256 = "12c6f3xcj38zbiya3m4glwr5pkh0fq51gmch994i2mg5xy1ni3yw"; + rev = "e99d733e0213ceb8f548ae6551b04ae32e590c80"; + sha256 = "01v3612yplmgwbdiz7pgrc3a660q4z3v3g554nzxd3wn39cmd2wq"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-02-02"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d404ec306bfa4cdb0c3605dbb17e8a93a9597337"; - sha256 = "1m6dmfplyln4xvc09srqxby93ksq1a62qai09j9msnd5pv4yqniy"; + rev = "58fbfc627a93281a77f7d161d4ff702e639677b1"; + sha256 = "0vxqy0m1kvd4xfadv6pmx9l9h2pjrk7dsr43av6nf6xn2yrr7sin"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4751,12 +4763,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-31"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "53f3a8bdcb77d4a95b082fd57e12173f353c6c3e"; - sha256 = "0588rpf28fk922nmj44nl5m74a9762g2xx8y72b61k5iwpi2vp3h"; + rev = "93e58e100f37ef4fb0f897deeed20599dae9d128"; + sha256 = "1d6ym8g3fix2m6412485kbm43mb61wdb3ggm3q6ddqxxvh06n41c"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4775,12 +4787,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-02"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "24846a00941ec020c8addc7f52040a1b2fc12174"; - sha256 = "1civr6qrq7c0z50yx7y9ly6w76vv5a1h0iqa1rxw8spc7h66hdva"; + rev = "4546dec8b56bc56bc1d81e717e4a935bc7cd6477"; + sha256 = "179mz9pc7qp4vqmlmhd1pz9z0qagfkywb1l2sj7i1039smkf9p9a"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4811,12 +4823,12 @@ final: prev: material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2023-01-12"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; - sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; + rev = "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9"; + sha256 = "1abhf71ap9cs03ibi3qm8lw8kdynb86x85didnhlhb673xg0kbcz"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4847,12 +4859,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-02-03"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "4f97a8771a480bcacf1d1d0dbf82e47f682aba2c"; - sha256 = "1pnivvwh9bfddmqvzgs4qsc3qy2m8j4zk31d5l6dgz8bfp45c7w1"; + rev = "369f16f29559cb15931d3d5acfcf253969f74066"; + sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5183,12 +5195,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-01-12"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8238865e1d9c61f1a260c290653f2c419503e0a9"; - sha256 = "18rndx83magknmjyihl02vjnqjra2x6y5d9wzz5qkhhacl8jhhbb"; + rev = "245cf1e68840defcc75a16297740f6203f5a045d"; + sha256 = "1w933phd5p0jdgmcdxcsv6ddhs7zx11amp5ziixzfh91a845shmf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5207,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-03"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a16d133b426fe5ddfd97d30e3658772d403847f3"; - sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj"; + rev = "060986ec2fcb27cfa175ac24d6467f46261bc257"; + sha256 = "0y8lvqfgs3lqd09dmvh04dpj76r5qmjh7q09wblmrc0nf7big3q2"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5231,28 +5243,40 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-02-03"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d9a8d651501cd2f287742472af4b3103d991cd68"; - sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd"; + rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac"; + sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2b956364bfd64cceecb12cf43dfe81d6b831fb35"; - sha256 = "1ycr3s1g00imih7g8gqvyzj9rg0dh1qwdvn78cwfn0hqm24ab8dc"; + 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"; @@ -5315,12 +5339,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-03"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "7cc4c95d685c96071f48d352b7378dfe8fcd24a1"; - sha256 = "0rhn1j9sx0wcp13fzlrsy39mvqb4djy29l18pyyig293gqbgjfd7"; + rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; + sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5375,36 +5399,36 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-25"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00"; - sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w"; + rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; + sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; - sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; + rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; + sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-07"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; - sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; + rev = "0eb91afe11f1763a477655965684269a545012e1"; + sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5447,12 +5471,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2023-01-27"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461"; - sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70"; + rev = "d069f7fb562fb9eb6911fe23cda7aca2a387043e"; + sha256 = "0ir2cghjcz3wr1sp1fzvdjnwqrjy82n3zlhrcz7cs41n8f2wich7"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5519,12 +5543,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-01-29"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "aa793975d10dda69817190faea84e28eeb176934"; - sha256 = "15ml496n90dd80z4gm09562wzfv8npch3sz0kdv6hjkkgg04p3rw"; + rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; + sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5555,12 +5579,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-03"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "dcd316d381c5768cd6a11d53a3331e92c3943f3b"; - sha256 = "06cd6hyckmp2jvrh8k2sp465yarkznk6adwh0lmd95i6wrb1zhky"; + rev = "c3980083e9d0db50e9cc9adf14e930ff0404e845"; + sha256 = "0jd21zwa2mjxkr3ad7s3w43gzxwdqahhnv3gml5cn9qqncybszgb"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5589,14 +5613,26 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; + no-neck-pain-nvim = buildVimPluginFrom2Nix { + pname = "no-neck-pain.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "shortcuts"; + repo = "no-neck-pain.nvim"; + rev = "3ef7e6626825beb08d88747d574d8633e23a805b"; + sha256 = "0nsgqgm7hqyvhx2bg60zh5rrzcrhcll1lfqaspzkx9cic0yq42as"; + }; + meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; + }; + noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-29"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "34f7cf628666c6eb0c93fbe8a0490e977ac78b7b"; - sha256 = "0nkk0zji3fdjzjhd5l2lmqb5208mkw08xkgvvxbddsjwgxx3jbg4"; + rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; + sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5663,12 +5699,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8f5d730021497233c39d3adbf4b8043d4be163f8"; - sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0"; + rev = "a82aa08c0063843926947f3688b0e61fd71db680"; + sha256 = "14ijkjfbg5dm54wkp34rf6z9p5v2z7psxnfv526rqp9p4qqasghk"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5723,23 +5759,23 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-30"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "5a3523ddb573804752de6c021c5cb82e267b79ca"; - sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1"; + rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; + sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-02-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "a3e0146ba46a797a0118da0177cbec5e28722399"; + rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; @@ -5759,24 +5795,24 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "da1cd2557a16386829a213330e0fd46b61db7632"; - sha256 = "0ws45yilaq9kyssm5s1rj65k0xsiflg8fivjgggb3g3fvr6286p3"; + rev = "7a278012efb0a12bc49ecc3e16ec5591c41fae88"; + sha256 = "1wykg4d6rx6grfb69svwwhk7f28g2cf87bdb13pwlbxyl7cxw908"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2022-09-20"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b"; - sha256 = "1yyxcnnh560gilkrqadpiwx3kpql4msw0as2v9i2v8m4z5yw36bd"; + rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; + sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5795,12 +5831,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-02-03"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d"; - sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6"; + rev = "0c6a89af9a62ecc18f7cf89393b077af1063cd6c"; + sha256 = "1d490dli7r7sb0qviyy2b9n6ssy75iy8pszfbwyanp71v04k5v9w"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5903,60 +5939,60 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-29"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185"; - sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c"; + rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; + sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; - sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; + rev = "b4ded7de579b4e2a85c203388233b54bf1028816"; + sha256 = "188w0n42gzvc4c1j6i5i48j60zxx9lrc3nq2z8ly0m7l6lc88vx9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-12-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531"; - sha256 = "1glhxrv57gc3g60i876d5p3429z4kl6mhkbvrf41kvcqqb8m21m0"; + rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; + sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-31"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "885e958ff9de30cfbc359259eccf28cc493ad46b"; - sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss"; + rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; + sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2023-01-28"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3"; - sha256 = "0ljipdw5cbcny6790r85hsfhnf0may6bamf27s3mzabrczayyd1w"; + rev = "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c"; + sha256 = "0763sssfznv7l1mpgrkyd26avbmpza41iaikq4b65g0y56j318ix"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -6035,12 +6071,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-01-03"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "718f09fc3ee6381d881863a817e44935bf41b1ab"; - sha256 = "1i2s8a6bgvm65iynbhhbyii72sr0f4wsnpvpxxyh3fnr2vlf61wc"; + rev = "dbd396e7729ad35c9c238f9e20fe3c701d63bb3d"; + sha256 = "07l52iv763rjzwkwl9avd8p7kb8wf0ir6nvayi0pl38dfphb2qhm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6071,24 +6107,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "1f640d14d17f20cfc63c1acc26a10f9466e66a75"; - sha256 = "1cfl5cjjfcijdsnbh1f23vp3msjlpkvr81am6lpkhx5as2dfws67"; + rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; + sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2022-09-21"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "24d3e0228aec27280e091d09ff65593e99d4d564"; - sha256 = "06zp3hffwjgq3c30d7h3a3bnx7vw77xwz4g3kcb54rxffvhjwwvj"; + rev = "bb9e70fe83f2d176d3fae3234415c50f9231a8e2"; + sha256 = "1d84hy4vl3jkjzq0ir9p3rgal3nsagq5b9w0r20ql1c9n6cs2lqh"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6131,12 +6167,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-29"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "379be679d3c5f80964bc19131554b846dce5d34e"; - sha256 = "019wc4kxdyzpdbjazsy9ji1r0ymgbwx620ghvqw4wdvccyklg5if"; + rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; + sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6155,12 +6191,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-31"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8"; - sha256 = "1hmkm3znqm7c6fi0qai1i424qjm5b9dh9l0srzyy7cax3629yyfr"; + rev = "649137cbc53a044bffde36294ce3160cb18f32c7"; + sha256 = "1xy1jzjhjn6m4xy556giiq265flli04csl0c1wf4dgpa03rd0yqf"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6227,12 +6263,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/"; }; @@ -6251,12 +6287,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/"; }; @@ -6273,6 +6309,30 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; + nvim-nu = buildVimPluginFrom2Nix { + pname = "nvim-nu"; + version = "2023-01-03"; + src = fetchFromGitHub { + owner = "LhKipp"; + repo = "nvim-nu"; + rev = "1aad12e866f6d53dd5ec31ada79767199334a4ca"; + sha256 = "022gmlrncbs46fqkbcnc4y8jyfasqac5nd09qq1qxdjgkw4924kj"; + }; + meta.homepage = "https://github.com/LhKipp/nvim-nu/"; + }; + + nvim-osc52 = buildVimPluginFrom2Nix { + pname = "nvim-osc52"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "ojroques"; + repo = "nvim-osc52"; + rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; + sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + }; + meta.homepage = "https://github.com/ojroques/nvim-osc52/"; + }; + nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; version = "2022-11-16"; @@ -6299,12 +6359,12 @@ final: prev: nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2023-01-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "6a2065fbcd032075a06d2ab54508b69842bc4496"; - sha256 = "0i6kg4lw7v9fggi7j13lyb7ncchk1w10qdkzdgxn2cani2clwx9s"; + rev = "75210c554e935740448cfb532d8a671ae544bb1b"; + sha256 = "03wv5bswh3mm0ci5qdqgvxknwx3pd7qsxygyl9jdnffiwgw3qdb5"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6323,12 +6383,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-02-01"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a5580956e2c1841a248fae6ba88e21f72df9f04d"; - sha256 = "1607d7igrhrzhfaypnf20awgi1l32w57i5g1jdz4d5dpch1wi6wn"; + rev = "12cb37c1d850365c6d3cb512efff901ae94a6927"; + sha256 = "077qvj1wy6q3kpadnavsz50y7ba0n1vrv9qdm5v49yj889f5iibc"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6347,24 +6407,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180"; - sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd"; + rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; + sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-01-01"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; - sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; + rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; + sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6395,35 +6455,35 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-31"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "215b29bfad74518442621b9d0483a621483b066b"; - sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2"; + rev = "08a0aa1a3b7411ee0a7887c8818528b1558cef96"; + sha256 = "0kgc928nrdjzl0sjm1yqfd489yw36fa4w0vbmp1siwwfrck97l5n"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-03"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0e6d4b4172f30c4aa44a9adc9ea5719723a1fac3"; - sha256 = "1n98salqvdh23yxkx1m490sf6hvjqjzpyxm459sk33znj2j7nzvv"; + rev = "17d7cf6f4b4057a949e86df6fbc2e271ba788823"; + sha256 = "088vpscxda9vph9ncvspyk51pkbykjmb6d5vrassiy1vpcvpa2bh"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-01-06"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "cacee4828152dd3a83736169ae61bbcd29a3d213"; + rev = "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41"; sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; @@ -6455,12 +6515,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-31"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "249d90a84df63f3ffff65fcc06a45d58415672de"; - sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz"; + rev = "2f3583001e2bf793480f38cf0d055571787b0259"; + sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6491,35 +6551,47 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-01-09"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "aa83e4967bf78f85ffd9a11e159900c7ea7e423b"; - sha256 = "09x3bq4j9398avmzix78gm1qam0m34r9ifz7rb6l5rcqw7lhvr5q"; + rev = "496ff7ea19cdd4e4b7cf2aeeb6780d015f3f9fa5"; + sha256 = "0li2mcxppk37dqxpln6py056i7mzwf541f7mcd037h1zy14075bs"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-03"; + version = "2023-02-17"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "b915c4d4926f723c0a424e1a639384018e7d9efc"; - sha256 = "0sllv769q0v73alcxs1r8dpij8kp9f771sq93z9c413c35wwmcnz"; + rev = "352ce3e654cab593586fe02e7ca78c2cab13743d"; + sha256 = "026xi0grnqpp5j2vqx5n93y0g5avq0yx0qz23h88as5nhfa07wzj"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; + nvim-ufo = buildVimPluginFrom2Nix { + pname = "nvim-ufo"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-ufo"; + rev = "b70c9ef0f8e2673a11387a39185ff249e00df19f"; + sha256 = "1fx3w2mlc23m55whvvrs1g648yg862i50100wfxxljmfkvnc12yv"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; + }; + nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-28"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; - sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; + rev = "53faf5e6d38cb3ca5c7487421524fa2b187b15b2"; + sha256 = "1ad7x73dnmjzzhkgn6xcb0f4ir5j3zfqmbi1fsxw7ydsb433563j"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6550,12 +6622,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-09-14"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "31436f34f3f95e4e70853cd653fdf78246cb0e85"; - sha256 = "1i018fmglfyqd8q762vks8yhh2kwg754ysf7d6d3hq2sb7w7kzwn"; + rev = "e592a9142fbfe0878ce886cd0d745963604c61d2"; + sha256 = "00gwdnmsc0dlc0p8j6b6jld1vh78zf57dmk2arw3f0xpwirgkkxx"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -6598,24 +6670,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-01-27"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b"; - sha256 = "1197x2agkc5h97z1hi6pk72sbx397vccpc5xsxc9hrsq5llpx37n"; + rev = "f336322f865cfa310ae15435c6bec337687b6b20"; + sha256 = "1gyf9avw82fpdw8cvn611xzl0kq140b4ik7b4cc7mblmk6xmdqwp"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-02-03"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "7371dd220f1d08789cc225846d8cafed938777e9"; - sha256 = "0rcx62q9vrx0w6qgkpz39173r0fba6xk9ja212s93l3zwqp49wwb"; + rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; + sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6647,12 +6719,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-01-19"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; - sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; + rev = "1fe908fb4acdcee26573e9ccde0de94ec77e5e84"; + sha256 = "03n2109p1jpl1gjznjci8wi84b2lminvw0avxx6dx6sv5b8z2x67"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6671,12 +6743,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b"; - sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351"; + rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; + sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6695,12 +6767,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "09aab5d7ea230c9c4829e44698020b642e00d840"; - sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad"; + rev = "71bdcdf105a8feb16cd5248b40e44c88832f75ca"; + sha256 = "0pflq1p48rd3s5vfi2bk04ick2iyl8fg1a25qpawm8wb1ds10ln4"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6731,24 +6803,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-02-01"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "7ddbdc0741fdc90f73faa17fb332bc8700acadbf"; - sha256 = "01pf6pi9mm88slf7667np60a7x9zk0rwxz40cyxrfc4d012ivs3a"; + rev = "313ce5a04e7fc3d677ad906a94fc49c1f54d1572"; + sha256 = "1d9a7ddyd09ym53nvijiy5z67mj79a93fqsm35jxfv4wkcraq9xd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-02-02"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "f7b05feadc985f39639650067f1a333285cb4085"; - sha256 = "0pwk7g59cmfpnqvvflbxxknmy3hnp6g9rz5la1gs00n7391gmcqq"; + rev = "f93de9b8589eda0d1d766cbe3c76ed1e1abc0a71"; + sha256 = "11yp33398vya0b4ncf2whf5rj42h16kyd2h4xglyl77dixawmvgf"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -6837,6 +6909,18 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; + pest-vim = buildVimPluginFrom2Nix { + pname = "pest.vim"; + version = "2020-04-20"; + src = fetchFromGitHub { + owner = "pest-parser"; + repo = "pest.vim"; + rev = "ebeeea5e0757adee037135cf3b8248589b22ae16"; + sha256 = "159h9f96x127w1i0cj0cwb8cr2k0fbb9l3vsyky60h344p8amcbi"; + }; + meta.homepage = "https://github.com/pest-parser/pest.vim/"; + }; + pgsql-vim = buildVimPluginFrom2Nix { pname = "pgsql.vim"; version = "2021-12-08"; @@ -6875,12 +6959,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "c481c660fa903a0e295902b1765ecfbd6e76a556"; - sha256 = "0d30s2rnjdizy8mibxl7pw99ij8209k09myv03d2sqnzapgx28ib"; + rev = "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56"; + sha256 = "11h0fi469fdjck318sa4fr4d4l1r57z3phhna6kclryz4mbjmk3v"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -6982,6 +7066,18 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; + promise-async = buildVimPluginFrom2Nix { + pname = "promise-async"; + version = "2023-02-01"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "promise-async"; + rev = "7fa127fa80e7d4d447e0e2c78e99af4355f4247b"; + sha256 = "12d7l5b79fj4lpd3gfjqrmy6ffh06cxsr13vaw29rjif57wf0f53"; + }; + meta.homepage = "https://github.com/kevinhwang91/promise-async/"; + }; + psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; version = "2021-05-31"; @@ -6996,12 +7092,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-12-07"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; - sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; + rev = "82348352e6568fcc0385bd7c99a8ead3a479feea"; + sha256 = "14729v7rndi3l8fpnbzapgwb4dj7537fik54g6frm1r1724f5cr2"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -7177,12 +7273,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-12-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "667ae447d2c7efb64461a2c58f5311d1248cdb5f"; - sha256 = "0j2mp8kan6gf1ynv90pkwghjpsqzhxdfxs1v0kh55vmld2r31r56"; + rev = "2d08fffeb8533d3678bd796010c13c7fa2534263"; + sha256 = "060rh1a4cdbs8w28l3lkgk8r7k80pd44dqczdb2bpnhyvc7mckn1"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7225,12 +7321,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-02-01"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "40b4e0be0231eabc7406168b432d507c6b6332f9"; - sha256 = "1wap2hazm84yzd1x6in6mnglnx67xbavg17k5fqd117biyw8i5ir"; + rev = "cd0311d65cb3b8f8737b52f3294eb77d2fcec826"; + sha256 = "08n5ri9d9zm8r7mss6wxfjpyzsdvgrb18795ngvgyg34c10i0pcg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7285,12 +7381,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-25"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "b297167d9e01accc9b9afe872ce91e791df2dde0"; - sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih"; + rev = "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef"; + sha256 = "0sja04sgpaa30v3ndnffh8n2lx0igicjpmddc7h5v2n62il5z1a8"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7514,12 +7610,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2022-12-21"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "fdd158ce7554dc830fb86e0fe952cd9476cdf726"; - sha256 = "17xjcfjfzmy4crs6ks8drdjcygdnri776gf3vmnssjyvmzab3mdl"; + rev = "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c"; + sha256 = "16wsgb62xcps24xickrly8hqwdvdc5kiylq965xq0q5g74kiz9jh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7562,12 +7658,12 @@ final: prev: solarized-nvim = buildVimPluginFrom2Nix { pname = "solarized.nvim"; - version = "2022-12-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "solarized.nvim"; - rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; - sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + rev = "fe02ed49cc017cc93657bd6306a2624394611c69"; + sha256 = "185drqdf6qcwbjvs2f5gnz660w45d4pwqal40mbf1p3gd32il6qa"; }; meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; @@ -8105,12 +8201,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-12-08"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; - sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; + rev = "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de"; + sha256 = "1i76sjlw8irvk52g2sj90f9b3icdjvzp0zdc72fsbfjxd2kwr926"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -8129,36 +8225,36 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-31"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; - sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; + rev = "ee594419f3bc39b4123ad0cf8e7d4b7d6cad1303"; + sha256 = "0dyg09nw7kxylplln3p5905rb3y5jl6vzxx5nrix5a3qwfs2ijnl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-12-28"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; - sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; + rev = "e5696afabd8753d772987ea48434d9c0d8b0aa6b"; + sha256 = "1zcw5lm97kil8jk722xfcnxy9vqlffbrsfhk2f53hwxnabbkl3qq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-12-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "fab3e2212e206f4f8b3bbaa656e129443c9b802e"; - sha256 = "0paiaag3aazfv8rr0i43maq34pn3iga3lkjyllhfysqvdm8jk50f"; + rev = "580b6c48651cabb63455e97d7e131ed557b8c7e2"; + sha256 = "1yjdn4729syz80radl90f2bsh7jl73rxq5ss0yp2qjj7aj8hkhm6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -8296,6 +8392,18 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; + telescope-undo-nvim = buildVimPluginFrom2Nix { + pname = "telescope-undo.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "debugloop"; + repo = "telescope-undo.nvim"; + rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; + sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; + }; + meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; @@ -8322,12 +8430,12 @@ final: prev: telescope-zoxide = buildVimPluginFrom2Nix { pname = "telescope-zoxide"; - version = "2022-09-12"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "856af0d83d2e167b5efa080567456c1578647abe"; - sha256 = "10cybnf6lzi3vqbigphjgx45naqfg9b3sz6sbmf8hb960h6f8jz8"; + rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; + sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; @@ -8488,6 +8596,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; + tint-nvim = buildVimPluginFrom2Nix { + pname = "tint.nvim"; + version = "2022-09-27"; + src = fetchFromGitHub { + owner = "levouh"; + repo = "tint.nvim"; + rev = "f6a259861ba8c0d88afc2ef05140ddf345eb0296"; + sha256 = "0ffbi9nrmr1hrlkvh09xvcdqrxfi66msm9g4xg8ja3zj3gqvi3z0"; + }; + meta.homepage = "https://github.com/levouh/tint.nvim/"; + }; + tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; version = "2022-07-22"; @@ -8563,24 +8683,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-02-02"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "19aad0f41f47affbba1274f05e3c067e6d718e1e"; - sha256 = "1zslvsdv6y15yiqjyq52mdib15rk7k7k2qg1shwxhjjipgzykvpl"; + rev = "557664818f6af78de6192f0ce8bc2e887bf4943a"; + sha256 = "1pfr2240cwqjcdza18815lblcsr1ccd63phajcl31izsrx0ba78z"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-23"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "affb21a81e6d7de073378eb86d02864c594104d9"; - sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi"; + rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; + sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8611,12 +8731,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-30"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "2723d63aed0ca4564565cc2949e0d6d2bc2b8287"; - sha256 = "1bxzww9qxb442ch3i7m4bw58hn3l9lzckr0vnqp9hh55vqh7c3xk"; + rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; + sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8647,12 +8767,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-23"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271"; - sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i"; + rev = "247f9eeabae8e1efc0ed5bc613cc1a9c27e91828"; + sha256 = "174zv283scsv84wbbvm2j24fs0dy5dj5rcpqib3sdyxfydvvc18p"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8731,12 +8851,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; - sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; + rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; + sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -8753,6 +8873,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; + unison = buildVimPluginFrom2Nix { + pname = "unison"; + version = "2023-02-17"; + src = fetchFromGitHub { + owner = "unisonweb"; + repo = "unison"; + rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; + sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; + }; + meta.homepage = "https://github.com/unisonweb/unison/"; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; version = "2021-02-06"; @@ -8839,12 +8971,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-30"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "13a24c0a09d29db4a1683ef950f929d97c57ef90"; - sha256 = "044s9di41cif3d7ij349v135vnxqhrl10fnagq6lyn364jw3lad1"; + rev = "c28c3fd97b25776038f51b8062790395bc2dae21"; + sha256 = "1npfs6dy0k89wf848wsjx48mkaphswxwlmwhvddxkqfwmld26xgp"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8935,12 +9067,12 @@ final: prev: vim-addon-actions = buildVimPluginFrom2Nix { pname = "vim-addon-actions"; - version = "2020-05-03"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-actions"; - rev = "6d350ca6075779af32016f0a0bd3e3521ec4a9eb"; - sha256 = "1098jc4amwfvcrfjfa5hgmyrjrbl680c3s56h7grvyl3i6n4hj34"; + rev = "f6ea95cfcc13fa6338302daff5ebafa9c936336c"; + sha256 = "06rjzdbk1x3hwkz7kfggsyv76jqzbar8vv96yj63dfncmyw2bsji"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; @@ -9031,12 +9163,12 @@ final: prev: vim-addon-manager = buildVimPluginFrom2Nix { pname = "vim-addon-manager"; - version = "2022-06-29"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e"; - sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l"; + rev = "be43aaaa70cf7c08c93f66051612d24de4c9daf8"; + sha256 = "10gsrs69gcjvjcn4hjrqlpsnlqm67gygzlzld6c3cbav1gfbsq08"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -9571,12 +9703,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-30"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f"; - sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h"; + rev = "ee44975ea9797d932de737a770ab6b743b5aa5db"; + sha256 = "14dsjy49jngi8r851casmyg1swwlx0kmhnalkfqs59jkda7bkg33"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9631,24 +9763,24 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-12-16"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "48d44707a821f962f56c3d0553144c77211749fa"; - sha256 = "0pgrmcq79jbj68zw1s9wfa5lq133xn34gx3zd2r1dllp2ybqf62a"; + rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; + sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; - sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; + rev = "1b76987b6719bee259ba8d1e03a1e7f624a3615f"; + sha256 = "0542dzzixavsfbpdm4qrsnv639gpl70grvv5jhllm2kq4dqyhjil"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9835,12 +9967,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-27"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; - sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; + rev = "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f"; + sha256 = "09ly10yclzkg8p4p0d50bznss76h3252jvpi9wj3qar48jgpmng1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9859,12 +9991,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2023-01-06"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; - sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; + rev = "caf45f54dad6150970331ac115e531524e418c7c"; + sha256 = "1x1qvn245lz8q0a7v6l0s6fr9pjrm8ar9gf72hd1iiskzly28ax0"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9955,12 +10087,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2022-01-14"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "00e77d90452e3c710014b26dc61ea919bc895e92"; - sha256 = "1ind8lyghdizgs0q59k3svwdmnq8l88b8ns1qq1xvz47rh836c6w"; + rev = "6cc2691576f97d43f8751664d1a1a908b99927e5"; + sha256 = "151fxvhz6pi021rg9bc2g564a13lvbcwh3lpa4vl3g5w9j95pmv3"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -10351,24 +10483,24 @@ final: prev: vim-fubitive = buildVimPluginFrom2Nix { pname = "vim-fubitive"; - version = "2022-11-11"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-fubitive"; - rev = "318b5ec47f8f1a65b11aae4d11736420a8d3604e"; - sha256 = "19g1iqcpbgy0kqzp3av8xr7djwkv79443ghwfjckhi6ws40hbvgr"; + rev = "f522e7c1c958d099438b375f38576f0f2f5100d2"; + sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j"; }; meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-01-17"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; - sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; + rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; + sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10507,12 +10639,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-03"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "7bf2074f340447c10b3af4ace96cc61e5f325693"; - sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46"; + rev = "819851b6ba8fdcf15454ae3a713622128c795774"; + sha256 = "0l36zy577zai4qv9327nysyaakbna8rmf6x7sj1h2dqgp7jag3fa"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10808,12 +10940,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-02-01"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "d6ca7f77eeaf61b3e6ce9f0e5a978d606df44298"; - sha256 = "02sgnp9yr0bdg8r5w24cxdvy01vw2whkh0fx11d9vfg0gqshi2hh"; + rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; + sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10892,12 +11024,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2023-01-29"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "c7f73e6788b5a97ac700f6c1fe09c26ebfa324d0"; - sha256 = "1f95877cgv9mvln6v78sgccwdfgvbaga9wbyckxw8rrbnrikwxam"; + rev = "8ca306a9484d6d184de8921a9cab03c63ee9aa79"; + sha256 = "0hrvsq95rqwp0kfsdiid5qv0bfx1i7wc5yn7qmdqc660s7abwqxs"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -11049,12 +11181,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-07-25"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "e48aae3c7e3136682b3f4c6cfd85867b392f7f1a"; - sha256 = "06caj10yw71rbksf0cjdxak3c1qm7qcby7jrc26llk5qhfpwgh2a"; + rev = "98cf55a5074695e3fca1ccace66ab5563e35111e"; + sha256 = "1kavcc0vpzgzly39qpbcb6a1kmp456c0jz6jc3vmw3sql8c070fa"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -11121,12 +11253,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-02-03"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "ab78b1b16601274c1b93a43792080ef3faff06e9"; - sha256 = "0k2h8508x6ga4gayrknrdqh6w5jhpf4vbz0ba8018264pnvz9fqd"; + rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; + sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11241,12 +11373,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "25337623cf11e2ac9c73dcba1a48b86fe103d887"; - sha256 = "020c8m76yp0ddwln4iajy231ifia2bxvly0b4ibfn5sgnqqf2cxm"; + rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; + sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11350,12 +11482,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-01-18"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; - sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; + rev = "945e01e39fc137bd74bb3aa8c4f40e6ffb5be2dd"; + sha256 = "04lzlz7y72nw5in3r46xc8xb1f4avdcjbwl1sic9v0gbr4w3g2hb"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11446,12 +11578,12 @@ final: prev: vim-monokai-tasty = buildVimPluginFrom2Nix { pname = "vim-monokai-tasty"; - version = "2022-11-25"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "55dcb855be754178967b860b0fa63621c319ce0a"; - sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8"; + rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b"; + sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -11830,12 +11962,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2022-08-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "7dbda1c885c4c5dd3f865aa29e1b82167663aeec"; - sha256 = "0f4bkz619lp0fr1966njm3m5587vq2mbmahy2ya5d8nnqs5f770p"; + rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; + sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -12610,12 +12742,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-01-28"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80"; - sha256 = "1zpffb0f8scgsmpv0y4pbnlp09kv0lgmrn9ss8h53byrqsa14rif"; + rev = "68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b"; + sha256 = "05x30vn156x5r57pz4p0ha44riwbprxph4rc98fl507229mnmp60"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12863,12 +12995,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-01-30"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "048f15403d9edfa513a50fafd7b107306c5512e4"; - sha256 = "07vjls2cgrnrqb84vc3g00rc3c65xpvrnxyzwjm1kaprzw70wwmm"; + rev = "c63b94c1e5089807f4532e05f087351ddb5a207c"; + sha256 = "1czd0k91im222ljz6jbggj5k4v2wvb6r1gql1w4ri56s07hc3rbx"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -13043,24 +13175,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-02-02"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7"; - sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9"; + rev = "95a6ccbe9f33bc42dd4cee45731d8bc3fbcd92d1"; + sha256 = "1nxrva8gs2fq6vi3w26ns6lrfpbyfw495knidpx9pmvcf0ypxcva"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2022-10-07"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "907174052a504e60e9b915f5c083ee5f6e067080"; - sha256 = "07jsgsv4j1zcxizl9wflib68rrp61zpxzy89yzak4b1lyxnl66s9"; + rev = "41f24890005f6bce34b1603e7c0d530fd70bc2da"; + sha256 = "1ms54fyxwxh4albrdgxpv99k3rwdbb1wy5ss95l585hmk9hfr27q"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -13115,12 +13247,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-06-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "c93eb128332f8245776b753407ab6c4432c4c556"; - sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; + rev = "b06bc8715cbcb4aa0444abfd85fb705b659ba055"; + sha256 = "0k69hqaxgbhjwq7wf30l8i1b6xv5qhzm4mbg6hydil5rj6zwf7xv"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -13271,12 +13403,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b67957731086466ed5d967cd1dac7f6981603156"; - sha256 = "0s35cx7yxx6rc7qs88c4j0109y7b9lgwd15p0a33pwbwj0h3x6ap"; + rev = "ee4ab57adf62a309aeef383a2da23b6e48e5ae50"; + sha256 = "1k5nhwcn7ckn44pzy49fn7i116lydarzn9ks1cczwh9nkmwwwsks"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13571,12 +13703,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-31"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ecf0c51b07ffedeca054581623bdda0d458e39d2"; - sha256 = "0xvpfsbglr65zjs26slwms9n8ibjy4s93vny2p5s2q5f5mgnlsd7"; + rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; + sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13584,12 +13716,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-02-02"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ef5b0d9b85e7bb57b00b4571db4804aec0e10eb"; - sha256 = "1nk85v06s4kybvnmh8raxcmj49snph4nsbfyizwcixwr592amcs1"; + rev = "aa55f528d1a12ba2cdf7953639e5b6ced9aa1999"; + sha256 = "1f3dcbid27vcxs1r0rhvzm0rfvghianvs03bah5xpxmzj0q5cvnc"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13692,12 +13824,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-23"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531"; - sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3"; + rev = "5224c261825263f46f6771f1b644cae33cd06995"; + sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13873,12 +14005,12 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "136dda65769cee45119f16e4bc3d3f13a7aecb28"; - sha256 = "0bsnvcixvk2vrimbyhxblj9anhig69jwxscyd2l05pp1njpzb424"; + rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; + sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -13921,24 +14053,24 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-12-31"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; - sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; + rev = "a0d9adedafeb1a33a0159d16ddcdf194b7cea881"; + sha256 = "0qcjwms102cpdbjamda3cbdwbqdk4zj5zrvr9dlj2lmwkdjqqfdz"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-12-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "2fd9f9f29270bb28477e000100625276ec2a2377"; - sha256 = "1b8w280yivsb34547y7kdcsvgcil41sfj8kvyvs6d24yrxbqs20w"; + rev = "0413c52500cd0133b0cd8e7e7d43084855ac1760"; + sha256 = "0yw7fi9z4rlb2vpm2qp6sm118hjz5vzix6nl7h654vp12zzqrs0g"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -13969,12 +14101,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-02-01"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8769e767f12f5bf0b7d1250ee067088e7054809a"; - sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p"; + rev = "60f8f40df0db92b5715642b3ea7074380c4b7995"; + sha256 = "0hgm542vdav33gj9dacy43anh9ql7x8jr1ihwbx11jlxqr5vhhp7"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13993,12 +14125,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-02-02"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053"; - sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj"; + rev = "c37df0dcd9a379fc6e17dfaac42ecf9ce5b25977"; + sha256 = "0s6jpa5n7h2235x2kx7i7qhrf9zzvqqhc4h8crq62da2qvhhqsqh"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14017,12 +14149,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2023-02-03"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "89a044730bf5402c49db03475a9fa56782ca9d1c"; - sha256 = "0d7956wi0lcbimxbn5cmghw11vb8gfsg2pd6yr4xja6bb4ldlbrk"; + rev = "ebcbf51e13a5fea046c784906c149a057ba9d8b6"; + sha256 = "1hbjwv2chrj310nvikb0pbs5wjj0bicx2874vjn2qh0rfypzqr1b"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -14041,12 +14173,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-03"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "2afe6de953b76d43822cf8377c019ff831a7c73b"; - sha256 = "1japfd2f7yw2vbyk7mh1qr0x6dnnra1k7frl3k077spc3nanh57r"; + rev = "66bb06771789d677ef2b7c9a0bd57941298f6a9f"; + sha256 = "1rp53hwm19bi53y0vndv2m4222ml7qz2iib23wqdj709azz6sr0j"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a1b0c2af0316..349977368b05 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -5,12 +5,12 @@ { ada = buildGrammar { language = "ada"; - version = "e9e2ec9"; + version = "42cc2eb"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; - hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg="; + rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba"; + hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "c473c09"; + version = "257efff"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; - hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + rev = "257efffa387da3283a37816b71dedfecf4af5222"; + hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -115,26 +115,37 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "a29bac0"; + version = "5b6c4d0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "a29bac0681802139710b4d3875540901504d15cb"; - hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; + rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; + hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; capnp = buildGrammar { language = "capnp"; - version = "740c757"; + version = "cb85cdd"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "740c757b9585925b1ed27cef7d61ac39b7824304"; - hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA="; + rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; + hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; }; 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"; @@ -148,12 +159,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "a322653"; + version = "399605a"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; - hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; + rev = "399605a02bcd5daa309ce63a6459c600dce3473f"; + hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -260,12 +271,12 @@ }; diff = buildGrammar { language = "diff"; - version = "1d63cd4"; + version = "f69bde8"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "1d63cd49529ef3153393cf8f620718b274bba715"; - hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk="; + rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f"; + hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -293,12 +304,12 @@ }; ebnf = buildGrammar { language = "ebnf"; - version = "ef241bc"; + version = "8e635b0"; src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; - rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; - hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + rev = "8e635b0b723c620774dfb8abf382a7f531894b40"; + hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf.git"; @@ -360,12 +371,12 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "a130858"; + version = "203f7bd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; - hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; + rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"; + hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; @@ -393,12 +404,12 @@ }; fish = buildGrammar { language = "fish"; - version = "6675b56"; + version = "f917690"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "6675b56266b3f615fb112205b6b83a79315309c4"; - hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A="; + rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"; + hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -415,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "edcb337"; + version = "dd35c67"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; - hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; + rev = "dd35c67b1653963d3b4cca7bfbceb6ec2e6f006f"; + hash = "sha256-AVImNPg2d/vavpg+IBholzKiH8Hod4m7V3aJxWTnMKk="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -437,12 +448,12 @@ }; func = buildGrammar { language = "func"; - version = "88ee7d0"; + version = "f161cfe"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-func"; - rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa"; - hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA="; + rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f"; + hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-func"; }; @@ -459,23 +470,23 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "a8fa839"; + version = "31ebb7c"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; - hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; + rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"; + hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; git_rebase = buildGrammar { language = "git_rebase"; - version = "127f5b5"; + version = "d8a4207"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; - hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E="; + rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; + hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -526,12 +537,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "c0bfd26"; + version = "40cfb72"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; - hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; + rev = "40cfb72a53654cbd666451ca04ffd500257c7b73"; + hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -582,12 +593,12 @@ }; gosum = buildGrammar { language = "gosum"; - version = "68974b6"; + version = "bd0ec1f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-go-sum"; - rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7"; - hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4="; + rev = "bd0ec1fe9d68a5d4713d907417a43d489fa1b62a"; + hash = "sha256-BFwYKVbCBCC2ZvockKqiVFHOlTc3/YFIaZ2OqkO52yY="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; }; @@ -626,12 +637,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "aee3725"; + version = "3bdba07"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; - hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; + rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; + hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -824,12 +835,12 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "505f5bd"; + version = "fdc7757"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; - hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; + rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2"; + hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; @@ -846,12 +857,12 @@ }; kdl = buildGrammar { language = "kdl"; - version = "f83f394"; + version = "b50d6c8"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80"; - hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4="; + rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2"; + hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; @@ -890,12 +901,12 @@ }; ledger = buildGrammar { language = "ledger"; - version = "47b8971"; + version = "f787ae6"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; - hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg="; + rev = "f787ae635ca79589faa25477b94291a87e2d3e23"; + hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -945,24 +956,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "abea13b"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; - hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "abea13b"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; - hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1035,12 +1046,12 @@ }; norg = buildGrammar { language = "norg"; - version = "6348056"; + version = "1a30509"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; - hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI="; + rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; + hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1115,12 +1126,12 @@ }; php = buildGrammar { language = "php"; - version = "973694f"; + version = "f860e59"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; - hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; + rev = "f860e598194f4a71747f91789bf536b393ad4a56"; + hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1181,12 +1192,12 @@ }; pug = buildGrammar { language = "pug"; - version = "26f6ac8"; + version = "884e225"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; - hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; + rev = "884e225b5ecca5d885ae627275f16ef648acd42e"; + hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; @@ -1247,12 +1258,12 @@ }; racket = buildGrammar { language = "racket"; - version = "dc9c334"; + version = "1a5df02"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; - hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; + rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b"; + hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1300,6 +1311,17 @@ }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; + ron = buildGrammar { + language = "ron"; + version = "049a3ef"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-ron"; + rev = "049a3ef4e271089107dd08e4aeb195abd1f77103"; + hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; + }; rst = buildGrammar { language = "rst"; version = "25e6328"; @@ -1313,12 +1335,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"; }; @@ -1423,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "30e15d4"; + version = "0d7a121"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "30e15d45dceb24ea51acf81ee7d75d81567b6e02"; - hash = "sha256-s8jeS8FRDPQQ9Iq0Vi12GrshM/E8opdPI0Xxre5oL0I="; + rev = "0d7a121b2a08fb37109f7be1cc6654443cad661f"; + hash = "sha256-b3HtiAoknPgmivnN/GVHcFHbAgl1an41iSS13wTFyGA="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1503,12 +1525,12 @@ }; teal = buildGrammar { language = "teal"; - version = "1ae8c68"; + version = "2158ecc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; - hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc="; + rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2"; + hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; @@ -1527,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "634a73f"; + version = "c5a9454"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b"; - hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA="; + rev = "c5a94547f01eb51b26446f9b94ee8644fa791223"; + hash = "sha256-2RNS0raJ0sEbBECwtI8hMG4Dir8KAx9PENwlRb7lY8o="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1549,12 +1571,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "6fd16d8"; + version = "6d2ec89"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7"; - hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I="; + rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3"; + hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1628,12 +1650,12 @@ }; v = buildGrammar { language = "v"; - version = "719cf0c"; + version = "136f3a0"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3"; - hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc="; + rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; + hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1673,12 +1695,12 @@ }; vim = buildGrammar { language = "vim"; - version = "55ff1b0"; + version = "e39a7bb"; src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; - hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; + rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590"; + hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; @@ -1739,12 +1761,12 @@ }; zig = buildGrammar { language = "zig"; - version = "d90d38d"; + version = "6b3f578"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; - hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; + rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; + hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4f28c4bde69d..bd03fd2fde47 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -700,6 +700,10 @@ self: super: { callPackage ./nvim-treesitter/overrides.nix { } self super ); + nvim-ufo = super.nvim-ufo.overrideAttrs (old: { + dependencies = with self; [ promise-async ]; + }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim plenary-nvim ]; }); @@ -941,6 +945,10 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; }); @@ -991,6 +999,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 ]; @@ -1083,7 +1096,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI="; + cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw="; }; in '' @@ -1193,7 +1206,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 27125fb21fe8..8af156a5841e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -325,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, @@ -441,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/,, @@ -470,6 +472,7 @@ https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, +https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, @@ -528,6 +531,8 @@ https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, +https://github.com/LhKipp/nvim-nu/,HEAD, +https://github.com/ojroques/nvim-osc52/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/petertriho/nvim-scrollbar/,HEAD, @@ -548,6 +553,7 @@ https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/mrjones2014/nvim-ts-rainbow/,, https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD, +https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, @@ -575,6 +581,7 @@ https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/andsild/peskcolor.vim/,, +https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/motus/pig.vim/,, https://github.com/aklt/plantuml-syntax/,, @@ -587,6 +594,7 @@ https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, +https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, @@ -696,6 +704,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, +https://github.com/debugloop/telescope-undo.nvim/,HEAD, https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, @@ -712,6 +721,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, +https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, https://github.com/edkolev/tmuxline.vim/,, @@ -734,6 +744,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/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4235aa5e929e..74c811c2eae8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -317,8 +317,8 @@ rec { lib.warnIf (wrapManual != null) '' vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`. ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual." - else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only." - else ""}'' + else lib.optionalString (wrapManual == false && name == "vim") "Set `standalone = true` to get the *vim wrappers only." + }'' lib.warnIf (wrapGui != null) "vim.customize: wrapGui is deprecated: gvim is now automatically included if present" lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null) @@ -330,7 +330,7 @@ rec { else throw "at least one of vimrcConfig and vimrcFile must be specified"; bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } '' vimrc=${lib.escapeShellArg vimrc} - gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} + gvimrc=${lib.optionalString (gvimrcFile != null) (lib.escapeShellArg gvimrcFile)} mkdir -p "$out/bin" for exe in ${ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9e4548ad0fe1..00a1a5f16e10 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2022.12.604"; - sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng="; + version = "2023.2.1404"; + sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.220"; - sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; + version = "0.0.224"; + sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; }; meta = with lib; { license = licenses.mit; @@ -1555,8 +1555,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.23"; - sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; + version = "1.5.0"; + sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM="; }; meta = with lib; { license = licenses.mit; @@ -1865,8 +1865,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.2"; - sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; + version = "1.23.3"; + sha256 = "sha256-0qflugzWA1pV0PVWGTzOjdxM/0G8hTLOozoXCAdQnRY="; }; meta = { license = lib.licenses.mit; @@ -1929,8 +1929,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.11.0"; - sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; + version = "2023.1.0"; + sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U="; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; @@ -2146,8 +2146,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.14.2022120303"; - sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; + version = "1.15.2023021403"; + sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; }; buildInputs = [ jdk ]; meta = { @@ -2226,8 +2226,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.22.0"; - sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; + version = "4.24.0"; + sha256 = "sha256-hJy+ymnlF9a2vvN/HhJ5N75lIc2afzkq+S0Cv/KnD3M="; }; meta = { license = lib.licenses.mit; @@ -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"; @@ -2737,8 +2737,8 @@ let mktplcRef = { name = "pdf"; publisher = "tomoki1207"; - version = "1.2.0"; - sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; + version = "1.2.2"; + sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; }; meta = { description = "Show PDF preview in VSCode"; @@ -3089,6 +3089,22 @@ let }; }; + zhwu95.riscv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "riscv"; + publisher = "zhwu95"; + version = "0.0.8"; + sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; + }; + meta = with lib; { + description = "Basic RISC-V colorization and snippets support."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv"; + homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support"; + license = licenses.mit; + maintainers = [ maintainers.CardboardTurkey ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/lua/default.nix index 529428de6702..6c9c72ca6094 100644 --- a/pkgs/applications/editors/vscode/extensions/lua/default.nix +++ b/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/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index e713ba29e84b..7089f9e3d39d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -1,14 +1,11 @@ { lib, vscode-utils, jq, moreutils }: -let - inherit (vscode-utils) buildVscodeMarketplaceExtension; - -in buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.11.1003381023"; - sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; + version = "2023.2.1000411022"; + sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index 7c58a4bdfb34..818cca51772a 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -25,8 +25,7 @@ }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile - then import mutableExtensionsFilePath else []; + mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath); vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 1b4f4508fbf0..c2036566b384 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/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/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1e6195021c69..65675dd92488 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/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 = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8"; - x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap"; - aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir"; - aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf"; - armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20"; + x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h"; + x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0"; + aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5"; + aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x"; + armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx"; }.${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.75.0"; + version = "1.75.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 08219714061d..cd89ab7d783d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/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/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix new file mode 100644 index 000000000000..b7c357ca2709 --- /dev/null +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchgit +, alsa-lib +, gtk3 +, libGL +, libGLU +, libX11 +, pkg-config +, upx +, xcbutil +}: + +stdenv.mkDerivation { + name = "c64-debugger"; + version = "0.64.58.6"; + + src = fetchgit { + url = "https://git.code.sf.net/p/c64-debugger/code"; + rev = "f97772e3f5c8b4fa99e8ed212ed1c4cb1e2389f1"; + sha256 = "sha256-3SR73AHQlYSEYpJLtQ/aJ1UITZGq7aA9tQKxBsn/yuc="; + }; + + buildInputs = [ + alsa-lib + gtk3 + libGL + libGLU + pkg-config + libX11 + xcbutil + ]; + + nativeBuildInputs = [ + upx + ]; + + postPatch = '' + # Disable default definition of RUN_COMMODORE64 + sed -i 's|^#define RUN_COMMODORE64|//#define RUN_COMMODORE64|' MTEngine/Games/c64/C64D_Version.h + ''; + + buildPhase = '' + runHook preBuild + + # Build C64 debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_COMMODORE64" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger c64debugger + make -C MTEngine clean + + # Build 65XE debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_ATARI" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger 65xedebugger + make -C MTEngine clean + + # Build NES debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_NES" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger nesdebugger + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d "$out/bin" + install -d "$out/share/doc" + install -m 755 c64debugger 65xedebugger nesdebugger "$out/bin" + install -m 644 MTEngine/Assets/*.txt "$out/share/doc" + install -m 644 MTEngine/Assets/*.pdf "$out/share/doc" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/c64-debugger"; + description = "Commodore 64, Atari XL/XE and NES code and memory debugger that works in real time"; + license = with licenses; [ + gpl3Only # c64-debugger + mit # MTEngine + # emulators included in c64-debugger + gpl2Plus # VICE, atari800 + gpl2 # nestopiaue + ]; + mainProgram = "c64debugger"; + maintainers = [ maintainers.detegr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index f8e585501289..91f6cb0de1a6 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-22"; + version = "2.0-26"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-ZQfJHQnT5mV6GC3dO6QV1fGsnyZMYqXiVdBSsimL5yU="; + hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE="; }; patches = [ diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index ad9c470bf427..b9ef4682e87d 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,126 +1,190 @@ -{ stdenv -, lib -, fetchpatch -, pkg-config -, cmake -, bluez -, ffmpeg -, libao -, gtk3 -, glib -, libGLU -, libGL -, gettext -, libpthreadstubs -, libXrandr -, libXext -, readline -, openal -, libXdmcp -, portaudio +{ lib +, stdenv , fetchFromGitHub -, libusb1 -, libevdev -, wxGTK30 -, soundtouch -, miniupnpc -, mbedtls_2 +, cmake +, pkg-config +, wrapQtAppsHook +, alsa-lib +, bluez +, bzip2 +, cubeb , curl -, lzo +, enet +, ffmpeg +, fmt_8 +, hidapi +, libevdev +, libGL +, libiconv +, libpulseaudio +, libspng +, libusb1 +, libXdmcp +, libXext +, libXrandr +, mbedtls_2 +, mgba +, miniupnpc +, minizip-ng +, openal +, pugixml +, qtbase , sfml -, libpulseaudio ? null +, soundtouch +, udev +, vulkan-loader +, xxHash +, xz + + # Used in passthru +, common-updater-scripts +, dolphin-emu +, jq +, testers +, writeShellScript + + # Darwin-only dependencies +, CoreBluetooth +, ForceFeedback +, IOKit +, moltenvk +, OpenGL +, VideoToolbox }: stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0"; + version = "5.0-18498"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = version; - sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; + rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7"; + sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU="; + fetchSubmodules = true; }; - patches = [ - # Fix FTBFS with glibc 2.26 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; - name = "02_glibc-2.26.patch"; - sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; - }) - # Fix FTBFS with GCC 8 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; - name = "03_gcc8.patch"; - sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; - }) - # Fix FTBFS with SoundTouch 2.1.2 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; - name = "05_soundtouch-2.1.2.patch"; - sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; - }) - # Use GTK+3 wxWidgets backend - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; - name = "06_gtk3.patch"; - sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; - }) - ]; - - cmakeFlags = [ - "-DENABLE_LTO=True" - ]; - nativeBuildInputs = [ - pkg-config cmake + pkg-config + wrapQtAppsHook ]; buildInputs = [ - bluez - ffmpeg - libao - libGLU - libGL - gtk3 - glib - gettext - libpthreadstubs - libXrandr - libXext - readline - openal - libevdev - libXdmcp - portaudio - libpulseaudio - libevdev - libXdmcp - portaudio - libusb1 - libpulseaudio - wxGTK30 - soundtouch - miniupnpc - mbedtls_2 + bzip2 + cubeb curl - lzo + enet + ffmpeg + fmt_8 + hidapi + libGL + libiconv + libpulseaudio + libspng + libusb1 + libXdmcp + mbedtls_2 + miniupnpc + minizip-ng + openal + pugixml + qtbase sfml + soundtouch + xxHash + xz + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + bluez + libevdev + libXext + libXrandr + mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + CoreBluetooth + ForceFeedback + IOKit + moltenvk + OpenGL + VideoToolbox ]; + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DUSE_SHARED_ENET=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we dont need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" + ]; + + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" + ]; + + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # Use nix-provided libraries instead of submodules + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "if(NOT APPLE)" "if(true)" \ + --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; + passthru = { + tests.version = testers.testVersion { + package = dolphin-emu; + command = "dolphin-emu-nogui --version"; + }; + + updateScript = writeShellScript "dolphin-update-script" '' + set -eou pipefail + export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} + + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu "$version" --rev="$rev" + ''; + }; + meta = with lib; { - homepage = "https://dolphin-emu.org/"; + homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; + branch = "master"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + MP2E + ashkitten + xfix + ivar + ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix deleted file mode 100644 index 7f68b5821495..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wrapQtAppsHook -, qtbase -, bluez -, ffmpeg -, libGL -, libXrandr -, libusb1 -, libXdmcp -, libXext -, openal -, udev -, libevdev -, cubeb -, curl -, alsa-lib -, miniupnpc -, enet -, mbedtls_2 -, soundtouch -, sfml -, minizip-ng -, xz -, hidapi -, fmt_8 -, vulkan-loader -, libpulseaudio -, bzip2 -, libiconv -, pugixml -, xxHash - - # Used in passthru -, testers -, dolphin-emu-beta -, writeShellScript -, common-updater-scripts -, jq - - # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOKit -, VideoToolbox -, OpenGL -, libpng -, moltenvk -}: - -stdenv.mkDerivation rec { - pname = "dolphin-emu"; - version = "5.0-17995"; - - src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = "8bad821019721b9b72701b495da95656ace5fea5"; - sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; - fetchSubmodules = true; - }; - - patches = [ - # On x86_64-darwin CMake reportedly does not work without this in some cases. - # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765 - ./minizip-external-missing-include.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - cubeb - curl - ffmpeg - pugixml - xxHash - libGL - libpulseaudio - openal - libusb1 - libiconv - libpng - libXdmcp - hidapi - miniupnpc - enet - mbedtls_2 - soundtouch - sfml - minizip-ng - xz - qtbase - fmt_8 - bzip2 - ] ++ lib.optionals stdenv.isLinux [ - libXrandr - libXext - bluez - udev - libevdev - alsa-lib - vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit - VideoToolbox - moltenvk - ]; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DUSE_SHARED_ENET=ON" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we dont need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; - - qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" - # https://bugs.dolphin-emu.org/issues/11807 - # The .desktop file should already set this, but Dolphin may be launched in other ways - "--set QT_QPA_PLATFORM xcb" - # https://bugs.dolphin-emu.org/issues/12913 - "--set QT_XCB_NO_XI2 1" - ]; - - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - - # Use nix-provided libraries instead of submodules - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "if(NOT APPLE)" "if(true)" \ - --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; - - passthru = { - tests.version = testers.testVersion { - package = dolphin-emu-beta; - command = "dolphin-emu-nogui --version"; - }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu-beta "$version" --rev="$rev" - ''; - }; - - meta = with lib; { - homepage = "https://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; - branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - MP2E - ashkitten - xfix - ivar - ]; - # Requires both LLVM and SDK bump - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -} diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch deleted file mode 100644 index 7da013ecd8f6..000000000000 --- a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5e0cb8066fb1653399c54e93e42375295c2562bd -Author: Ivar Scholten -Date: Fri Sep 9 14:27:55 2022 +0200 - - Externals/minizip: add missing include to CheckFunctionExists - -diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt -index c3d7c5512e..f59f8b295c 100644 ---- a/Externals/minizip/CMakeLists.txt -+++ b/Externals/minizip/CMakeLists.txt -@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H) - target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) - endif() - -+include(CheckFunctionExists) - check_function_exists(fseeko HAVE_FSEEKO) - if (NOT HAVE_FSEEKO) - target_compile_definitions(minizip PRIVATE NO_FSEEKO) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index c1820646dc62..f26fb7c9d76c 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -1,39 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_net -, alsa-lib +{ alsa-lib , copyDesktopItems +, fetchFromGitHub , fluidsynth +, glib , gtest +, lib , libGL , libGLU +, libjack2 +, libmt32emu , libogg , libpng +, libpulseaudio , libslirp +, libsndfile , makeDesktopItem , makeWrapper , meson -, libmt32emu , ninja , opusfile , pkg-config -, libpulseaudio -, glib -, libjack2 -, libsndfile +, irr1 +, SDL2 +, SDL2_image +, SDL2_net +, speexdsp +, stdenv }: stdenv.mkDerivation rec { pname = "dosbox-staging"; - version = "0.78.1"; + version = "0.80.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; + hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; nativeBuildInputs = [ @@ -46,11 +49,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 - SDL2_net alsa-lib fluidsynth glib + irr1 libGL libGLU libjack2 @@ -61,11 +63,16 @@ stdenv.mkDerivation rec { libslirp libsndfile opusfile + SDL2 + SDL2_image + SDL2_net + speexdsp ]; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2_net}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_image}/include/SDL2" + "-I${SDL2_net}/include/SDL2" + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index b597abc7b069..f1874d62fba4 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -5,25 +5,36 @@ , pkg-config , makeWrapper , alsa-lib -, libX11 +, curl +, egl-wayland +, libao +, libdecor , libevdev -, udev +, libffi +, libGL , libpulseaudio -, SDL2 +, libX11 +, libXext +, libxkbcommon , libzip +, mesa , miniupnpc +, udev +, vulkan-headers , vulkan-loader +, wayland +, zlib }: stdenv.mkDerivation rec { pname = "flycast"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "v${version}"; - sha256 = "sha256-vSyLg2lAJBV7crKVbGRbi1PUuCwHF9GB/8pjMTlaigA="; + rev = "V${version}"; + sha256 = "sha256-PRInOqg9OpaUVLwSj1lOxDtjpVaYehkRsp0jLrVKPyY="; fetchSubmodules = true; }; @@ -35,13 +46,24 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - libX11 + curl + egl-wayland + libao + libdecor libevdev - udev + libffi + libGL libpulseaudio - SDL2 + libX11 + libXext + libxkbcommon libzip + mesa # for libgbm miniupnpc + udev + vulkan-headers + wayland + zlib ]; postFixup = '' diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 084bf0745429..aedf42ee126b 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -117,6 +117,10 @@ stdenv.mkDerivation rec { --subst-var-by mamePath "$out/opt/mame" ''; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=use-after-free" + ]; + desktopItems = [ (makeDesktopItem { name = "MAME"; diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index a2664e12641d..7713c145948c 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -7,17 +7,15 @@ , ffmpeg , glew , libffi +, libsForQt5 , libzip , makeDesktopItem , makeWrapper , pkg-config , python3 -, qtbase -, qtmultimedia , snappy , vulkan-loader , wayland -, wrapQtAppsHook , zlib , enableQt ? false , enableVulkan ? true @@ -27,6 +25,7 @@ let # experimental, see https://github.com/hrydgard/ppsspp/issues/13845 vulkanWayland = enableVulkan && forceWayland; + inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; in # Only SDL frontend needs to specify whether to use Wayland assert forceWayland -> !enableQt; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c72ff4929b22..ed6b75ad406a 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -734,6 +734,7 @@ in picodrive = mkLibretroCore { core = "picodrive"; + version = "unstable-2023-02-15"; dontConfigure = true; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; meta = { diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e4198184edc2..08c65a7dbff2 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -352,8 +352,8 @@ "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "62873cab5366999207c197e9f55987daee10be4a", - "sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=", + "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043", + "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=", "fetchSubmodules": true }, "play": { diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index a97114a07a57..b9efcaaf4f6e 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , sdl2Support ? true, SDL2 @@ -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 = "14702-cfb788941"; + rpcs3Version = "0.0.26-14702-cfb788941"; + rpcs3Revision = "cfb788941ce73ebf41060baf0867861dd6bd3e13"; + rpcs3Sha256 = "0kwd3x043x3gsqlax3jcb5g1w2v7v7gghmqgbrn3vimcc47x62vn"; ittapi = fetchFromGitHub { owner = "intel"; @@ -21,7 +21,7 @@ let sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; }; in -gcc11Stdenv.mkDerivation { +gcc12Stdenv.mkDerivation { pname = "rpcs3"; version = rpcs3Version; @@ -82,6 +82,6 @@ gcc11Stdenv.mkDerivation { homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ae38f5d3326f..ed9e24a910f6 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/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/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 37953f73c5dc..d3b285f36d78 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/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/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 3b5aa19658ce..2672e75580cb 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/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/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0e8f129f91f6..0d7ac403ad19 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/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/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh index 8192d3b5ab58..8be264541579 100644 --- a/pkgs/applications/emulators/wine/update-lib.sh +++ b/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/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix deleted file mode 100644 index 249cb2730404..000000000000 --- a/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/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix new file mode 100644 index 000000000000..482ea9e06fd5 --- /dev/null +++ b/pkgs/applications/emulators/xemu/default.nix @@ -0,0 +1,131 @@ +{ stdenv +, fetchFromGitHub +, lib +, makeDesktopItem +, copyDesktopItems +, pkg-config +, python3 +, ninja +, meson +, which +, perl +, wrapGAppsHook +, glib +, gtk3 +, libpcap +, openssl +, libepoxy +, libsamplerate +, SDL2 +, SDL2_image +, mesa +, libdrm +, libGLU +, gettext +, vte +}: + +stdenv.mkDerivation rec { + pname = "xemu"; + version = "0.7.84"; + + src = fetchFromGitHub { + owner = "xemu-project"; + repo = "xemu"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + }; + + nativeBuildInputs = [ + pkg-config + python3 + python3.pkgs.pyyaml + ninja + which + meson + perl + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + glib + gtk3 + openssl + mesa + libepoxy + libdrm + libpcap + libsamplerate + SDL2 + libGLU + SDL2_image + gettext + vte + ]; + + separateDebugInfo = true; + + dontUseMesonConfigure = true; + + setOutputFlags = false; + + configureFlags = [ + "--disable-strip" + "--meson=meson" + "--target-list=i386-softmmu" + "--disable-werror" + ]; + + buildFlags = [ "qemu-system-i386" ]; + + desktopItems = [(makeDesktopItem { + name = "xemu"; + desktopName = "xemu"; + exec = "xemu"; + icon = "xemu"; + })] ; + + preConfigure = let + branch = "master"; + commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; + in '' + patchShebangs . + configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") + substituteInPlace ./scripts/xemu-version.sh \ + --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" + # If the versions can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) + echo '${commit}' > XEMU_COMMIT + echo '${branch}' > XEMU_BRANCH + echo '${version}' > XEMU_VERSION + ''; + + preBuild = '' + cd build + substituteInPlace ./build.ninja --replace /usr/bin/env $(which env) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp qemu-system-i386 $out/bin/xemu + + for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512 + do + mkdir -p $out/share/icons/hicolor/$RES/apps/ + cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://xemu.app/"; + description = "Original Xbox emulator"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 003b07cb9759..c4c2d9e6528b 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.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/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index f299d9fe3fa1..069e6f63cc22 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8="; + sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; }; - cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc="; + cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 8b54d79622a4..a61b0980d851 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/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.optionals 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/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 334228f98ead..605340cbc85c 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 - ] ++ (if ifuseSupport then [ ifuse ] else []); + ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/applications/file-managers/vifm/default.nix index ad326e459775..ab7da2deac89 100644 --- a/pkgs/applications/file-managers/vifm/default.nix +++ b/pkgs/applications/file-managers/vifm/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, makeWrapper +, perl # used to generate help tags , pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,9 +18,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-j+KBPr3Mz+ma7OArBdYqIJkVJdRrDM+67Dr2FMZlVog="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ perl pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; + postPatch = '' + # Avoid '#!/usr/bin/env perl' reverences to build help. + patchShebangs --build src/helpztags + ''; + postFixup = let path = lib.makeBinPath [ udisks2 @@ -28,11 +34,11 @@ in stdenv.mkDerivation rec { wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}"; in '' - ${if mediaSupport then wrapVifmMedia else ""} + ${lib.optionalString mediaSupport wrapVifmMedia} ''; meta = with lib; { - description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}"; + description = "A vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/applications/finance/denaro/default.nix new file mode 100644 index 000000000000..aae4f973edd8 --- /dev/null +++ b/pkgs/applications/finance/denaro/default.nix @@ -0,0 +1,71 @@ +{ 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.2.0"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionMoney"; + rev = version; + hash = "sha256-ot6VfCzGrJnLaw658QsOe9M0HiqNDrtxvLWpXj9nXko="; + }; + + 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; + changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}"; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/applications/finance/denaro/deps.nix new file mode 100644 index 000000000000..c1665c383037 --- /dev/null +++ b/pkgs/applications/finance/denaro/deps.nix @@ -0,0 +1,118 @@ +# 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.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) + (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 = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) + (fetchNuGet { pname = "QuestPDF"; version = "2022.12.1"; sha256 = "0nbbk43jr73f0pfgdx3fzn57mjba34sir5jzxk2rscyfljfw002x"; }) + (fetchNuGet { pname = "ReadSharp.Ports.SgmlReader.Core"; version = "1.0.0"; sha256 = "0pcvlh0gq513vw6y12lfn90a0br56a6f26lvppcj4qb839zmh3id"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "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_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Requests"; version = "4.3.0"; sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +] diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1f78d5398596..a2e01303970a 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/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/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 59794b88a4fd..d535625c717a 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "saga"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0="; + sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 1f05f8e9fa66..a433cc6516de 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/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/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d5d64aef6d86..1d7863df05e8 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/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-62"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; - hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; + rev = finalAttrs.version; + hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI="; }; 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/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index c26b2f46e7f6..5c5745646b59 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "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/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 8b4411ad04b3..d088f633c3f3 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An easy-to-use color picker and editor"; + description = "A powerful color picker and formatter"; homepage = "https://github.com/FineFindus/eyedropper"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index e8fd0364808c..ca2aa96bea14 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ae44b47643cd..5f75d2770ac6 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -109,7 +109,9 @@ in /* menu: Video */ - name = "gap-2.6.0"; + pname = "gap"; + version = "2.6.0"; + src = fetchurl { url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -228,7 +230,9 @@ in /* menu: Filters/Enhance/Wavelet sharpen */ - name = "wavelet-sharpen-0.1.2"; + pname = "wavelet-sharpen"; + version = "0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here @@ -271,7 +275,7 @@ in gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; - name = "gimplensfun-${version}"; + pname = "gimplensfun"; src = fetchFromGitHub { owner = "seebk"; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 325d1bcf083d..8f70d9273b7a 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; + + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=format-truncation" + ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index a82c6ec2f78d..ecb09e539b3e 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , gnome , pkg-config , meson @@ -40,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU="; }; + patches = [ + # Fix build with libraw 0.21, can be removed on next update + # https://hydra.nixos.org/build/209327709/nixlog/1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; + sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; + }) + ]; + nativeBuildInputs = [ bison desktop-file-utils diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index b0e346331bce..d690f5e0671a 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -46,6 +46,11 @@ mkDerivation rec { url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; }) + (fetchpatch { + name = "support-libraw-0.21.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; + sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + }) ]; desktopItems = [ diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 951bb9d7d894..ff00d565f47d 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.5.2"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; + sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index a05dbc28be02..45688725c2af 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; diff --git a/pkgs/applications/graphics/kodelife/update.sh b/pkgs/applications/graphics/kodelife/update.sh new file mode 100755 index 000000000000..992f7c2bf434 --- /dev/null +++ b/pkgs/applications/graphics/kodelife/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix curl libxml2 jq + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +attr="${UPDATE_NIX_ATTR_PATH:-kodelife}" +version="$(curl -sSL https://hexler.net/kodelife/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + +pkgpath="$(findpath "$attr")" + +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" + +for system in aarch64-linux armv7l-linux x86_64-linux; do + url="$(nixeval "$attr".src.url "$system")" + + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" + + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +done diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index cfb63e0e3f7c..e8e6a2cc9f86 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.4"; + version = "5.1.5"; kde-channel = "stable"; - sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs="; + sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a9b000184718..86d8de46f992 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/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/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b1c4f2258f0b..54f956981ee9 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchFromGitLab, fetchurl -, boost, cmake, ffmpeg, qtbase, qtx11extras +{ lib, stdenv, fetchFromGitLab, fetchurl +, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper -, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL +, ninja, mpi, python3, tbb, libGLU, libGL , withDocs ? true }: let - version = "5.10.0"; + version = "5.11.0"; docFiles = [ (fetchurl { @@ -26,7 +26,7 @@ let }) ]; -in mkDerivation rec { +in stdenv.mkDerivation rec { pname = "paraview"; inherit version; @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; + sha256 = "sha256-WvkKGl5lG+apX6m4ULVZZVtDsSUjEVXe/seh95b+LmI="; fetchSubmodules = true; }; @@ -68,6 +68,7 @@ in mkDerivation rec { makeWrapper ninja gfortran + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index c1f78b1807f0..85bbd1414cd9 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,29 +1,66 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook -, lensfun, librsvg, gtk-mac-integration +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, makeWrapper +, pixman +, libpthreadstubs +, gtkmm3 +, libXau +, libXdmcp +, lcms2 +, libiptcdata +, fftw +, expat +, pcre +, libsigcxx +, lensfun +, librsvg +, libcanberra-gtk3 +, gtk-mac-integration }: stdenv.mkDerivation rec { - version = "5.8"; pname = "rawtherapee"; + version = "5.9"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; + hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + postPatch = '' + echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake + substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ + --replace "/Applications" "${placeholder "out"}/Applications" + ''; - # This patch is upstream; remove it in 5.9. - patches = [ ./fix-6324.patch ] - # Disable upstream-enforced bundling on macOS. - ++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper + ]; buildInputs = [ - pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg + pixman + libpthreadstubs + gtkmm3 + libXau + libXdmcp + lcms2 + libiptcdata + fftw + expat + pcre + libsigcxx + lensfun + librsvg ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ @@ -33,12 +70,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result"; + CMAKE_CXX_FLAGS = toString [ + "-std=c++11" + "-Wno-deprecated-declarations" + "-Wno-unused-result" + ]; - postUnpack = '' - echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/RawTherapee.app $out/bin + cp -R Release $out/Applications/RawTherapee.app/Contents + for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do + makeWrapper $f $out/bin/$(basename $f) + done ''; meta = { diff --git a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch b/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch deleted file mode 100644 index 8c3257e888c5..000000000000 --- a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0a55ca6d5..68c059aa5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -233,6 +233,6 @@ if(WIN32 OR APPLE) - endif() -- set(BUILD_BUNDLE ON FORCE) -+ set(BUILD_BUNDLE OFF) - endif() - - if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR) -- if(APPLE) -+ if(FALSE) diff --git a/pkgs/applications/graphics/rawtherapee/fix-6324.patch b/pkgs/applications/graphics/rawtherapee/fix-6324.patch deleted file mode 100644 index fa324c2c9389..000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-6324.patch +++ /dev/null @@ -1,356 +0,0 @@ -See: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://github.com/Beep6581/RawTherapee/commit/2e0137d54243eb729d4a5f939c4320ec8f8f415d - -diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc -index 6274154cb..98c743dad 100644 ---- a/rtengine/canon_cr3_decoder.cc -+++ b/rtengine/canon_cr3_decoder.cc -@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) - #endif - - struct LibRaw_abstract_datastream { -- IMFILE* ifp; -+ rtengine::IMFILE* ifp; - - void lock() - { -diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc -index 812f122b3..5da696af2 100644 ---- a/rtengine/dcraw.cc -+++ b/rtengine/dcraw.cc -@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c() - #endif - { - int len[2], pred[2]; -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - ifpthr.plistener = nullptr; - - #ifdef _OPENMP -@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw() - { - uchar *data = new (std::nothrow) uchar[raw_width + 1]; - merror(data, "sony_arw2_load_raw()"); -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - int pos = ifpthr.pos; - ushort pix[16]; - -@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base) - unsigned sony_curve[] = { 0,0,0,0,0,4095 }; - unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; - struct jhead jh; --/*RT*/ IMFILE *sfp; -+/*RT*/ rtengine::IMFILE *sfp; - /*RT*/ int pana_raw = 0; - - if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) -@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose: - fread (buf, sony_length, 1, ifp); - sony_decrypt (buf, sony_length/4, 1, sony_key); - sfp = ifp; --/*RT*/ ifp = fopen (buf, sony_length); -+/*RT*/ ifp = rtengine::fopen (buf, sony_length); - // if ((ifp = tmpfile())) { - // fwrite (buf, sony_length, 1, ifp); - // fseek (ifp, 0, SEEK_SET); -@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg() - { - const char *file, *ext; - char *jname, *jfile, *jext; --/*RT*/ IMFILE *save=ifp; -+/*RT*/ rtengine::IMFILE *save=ifp; - - ext = strrchr (ifname, '.'); - file = strrchr (ifname, '/'); -@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg() - *jext = '0'; - } - if (strcmp (jname, ifname)) { --/*RT*/ if ((ifp = fopen (jname))) { -+/*RT*/ if ((ifp = rtengine::fopen (jname))) { - // if ((ifp = fopen (jname, "rb"))) { - if (verbose) - fprintf (stderr,_("Reading metadata from %s ...\n"), jname); -diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h -index 89c1fcaff..f25157088 100644 ---- a/rtengine/dcraw.h -+++ b/rtengine/dcraw.h -@@ -73,7 +73,7 @@ public: - - protected: - int exif_base, ciff_base, ciff_len; -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - FILE *ofp; - short order; - const char *ifname; -@@ -125,7 +125,7 @@ protected: - int cur_buf_size; // buffer size - uchar *cur_buf; // currently read block - int fillbytes; // Counter to add extra byte for block size N*16 -- IMFILE *input; -+ rtengine::IMFILE *input; - struct int_pair grad_even[3][41]; // tables of gradients - struct int_pair grad_odd[3][41]; - ushort *linealloc; -@@ -278,7 +278,7 @@ void parse_redcine(); - class getbithuff_t - { - public: -- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} -+ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} - unsigned operator()(int nbits, ushort *huff); - - private: -@@ -288,7 +288,7 @@ private: - DCraw *parent; - unsigned bitbuf; - int vbits, reset; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - unsigned &zero_after_ff; - }; - getbithuff_t getbithuff; -@@ -296,7 +296,7 @@ getbithuff_t getbithuff; - class nikbithuff_t - { - public: -- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} -+ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} - void operator()() {bitbuf = vbits = 0;}; - unsigned operator()(int nbits, ushort *huff); - unsigned errorCount() { return errors; } -@@ -309,7 +309,7 @@ private: - } - unsigned bitbuf, errors; - int vbits; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - }; - nikbithuff_t nikbithuff; - -@@ -378,7 +378,7 @@ void parse_qt (int end); - // ph1_bithuff(int nbits, ushort *huff); - class ph1_bithuff_t { - public: -- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} -+ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} - unsigned operator()(int nbits, ushort *huff); - unsigned operator()(int nbits); - unsigned operator()(); -@@ -412,7 +412,7 @@ private: - } - - short ℴ -- IMFILE* const ifp; -+ rtengine::IMFILE* const ifp; - UINT64 bitbuf; - int vbits; - }; -@@ -430,11 +430,11 @@ void nokia_load_raw(); - - class pana_bits_t{ - public: -- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): -+ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): - ifp(i), load_flags(u), vbits(0), encoding(enc) {} - unsigned operator()(int nbits, unsigned *bytes=nullptr); - private: -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - unsigned &load_flags; - uchar buf[0x4000]; - int vbits; -diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc -index 1fb1d2e1b..951df2248 100644 ---- a/rtengine/dfmanager.cc -+++ b/rtengine/dfmanager.cc -@@ -540,7 +540,7 @@ std::vector *DFManager::getHotPixels ( const std::string &mak, const std - - int DFManager::scanBadPixelsFile( Glib::ustring filename ) - { -- FILE *file = fopen( filename.c_str(), "r" ); -+ FILE *file = ::fopen( filename.c_str(), "r" ); - - if( !file ) { - return false; -diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc -index 842766dcf..2321d18bb 100644 ---- a/rtengine/myfile.cc -+++ b/rtengine/myfile.cc -@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) - - #ifdef MYFILE_MMAP - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - int fd; - -@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - return fopen(fname); - } - #else - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) - } - #endif //MYFILE_MMAP - --IMFILE* fopen (unsigned* buf, int size) -+rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) - { - - IMFILE* mf = new IMFILE; -@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) - return mf; - } - --void fclose (IMFILE* f) -+void rtengine::fclose (IMFILE* f) - { - #ifdef MYFILE_MMAP - -@@ -207,7 +207,7 @@ void fclose (IMFILE* f) - delete f; - } - --int fscanf (IMFILE* f, const char* s ...) -+int rtengine::fscanf (IMFILE* f, const char* s ...) - { - // fscanf not easily wrapped since we have no terminating \0 at end - // of file data and vsscanf() won't tell us how many characters that -@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) - } - - --char* fgets (char* s, int n, IMFILE* f) -+char* rtengine::fgets (char* s, int n, IMFILE* f) - { - - if (f->pos >= f->size) { -@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) - return s; - } - --void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) -+void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) - { - f->plistener = plistener; - f->progress_range = progress_range; -@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub - f->progress_current = 0; - } - --void imfile_update_progress(IMFILE *f) -+void rtengine::imfile_update_progress(IMFILE *f) - { - if (!f->plistener || f->progress_current < f->progress_next) { - return; -diff --git a/rtengine/myfile.h b/rtengine/myfile.h -index 423edea9a..c655696e6 100644 ---- a/rtengine/myfile.h -+++ b/rtengine/myfile.h -@@ -30,8 +30,6 @@ namespace rtengine - - class ProgressListener; - --} -- - struct IMFILE { - int fd; - ssize_t pos; -@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) - - int fscanf (IMFILE* f, const char* s ...); - char* fgets (char* s, int n, IMFILE* f); -+ -+} -diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc -index 9da601e2a..097b9e711 100644 ---- a/rtengine/rtthumbnail.cc -+++ b/rtengine/rtthumbnail.cc -@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) - - Glib::ustring fullFName = fname + ".rtti"; - -- FILE* f = g_fopen (fullFName.c_str (), "wb"); -+ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); - - if (!f) { - return false; -@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) - return false; - } - -- FILE* f = g_fopen(fullFName.c_str (), "rb"); -+ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); - - if (!f) { - return false; -@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) - return false; - } - -- FILE *f = g_fopen (fname.c_str (), "wt"); -+ FILE *f = ::g_fopen (fname.c_str (), "wt"); - - if (!f) { - if (settings->verbose) { -@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) - embProfile = nullptr; - embProfileLength = 0; - -- FILE* f = g_fopen (fname.c_str (), "rb"); -+ FILE* f = ::g_fopen (fname.c_str (), "rb"); - - if (f) { - if (!fseek (f, 0, SEEK_END)) { -@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - { - - if (embProfileData) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (embProfileData, 1, embProfileLength, f); -@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - bool Thumbnail::readAEHistogram (const Glib::ustring& fname) - { - -- FILE* f = g_fopen(fname.c_str(), "rb"); -+ FILE* f = ::g_fopen(fname.c_str(), "rb"); - - if (!f) { - aeHistogram.reset(); -@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname) - { - - if (aeHistogram) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 8da308ba6175..400b5d262c40 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/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/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix new file mode 100755 index 000000000000..ca58271425d9 --- /dev/null +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, lib +, fetchFromGitHub +, jdk11 +, makeDesktopItem +, makeWrapper +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "structorizer"; + version = "3.32-11"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "Structorizer"; + desktopName = "Structorizer"; + genericName = "Diagram creator"; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + mimeTypes = [ "application/nsd" ]; + categories = [ + "Development" + "Graphics" + "VectorGraphics" + "RasterGraphics" + "ComputerScience" + ]; + keywords = [ "nsd" "diagrams" ]; + }) + ]; + + src = fetchFromGitHub { + owner = "fesch"; + repo = "Structorizer.Desktop"; + rev = version; + hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk="; + }; + + patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ]; + + buildInputs = [ jdk11 ]; + + postPatch = '' + chmod +x makeStructorizer + chmod +x makeBigJar + + patchShebangs --build makeStructorizer + patchShebangs --build makeBigJar + ''; + + buildPhase = '' + runHook preBuild + + ./makeStructorizer + ./makeBigJar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/share/mime/packages + + install -D ${pname}.jar -t $out/share/java/ + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}.jar" + + cat << EOF > $out/share/mime/packages/structorizer.xml + + + + Nassi-Shneiderman diagram + Nassi-Shneiderman-Diagramm + + + + EOF + + cd src/lu/fisch/${pname}/gui + install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png + for icon_width in 24 32 48 64 128 256; do + install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Create Nassi-Shneiderman diagrams (NSD)"; + homepage = "https://structorizer.fisch.lu"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/applications/graphics/structorizer/makeBigJar.patch b/pkgs/applications/graphics/structorizer/makeBigJar.patch new file mode 100644 index 000000000000..2090a7b35a45 --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeBigJar.patch @@ -0,0 +1,31 @@ +Reason: Running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.class, only the jar. + +diff --git a/makeBigJar b/makeBigJar +index 25547020..c34d0d9c 100644 +--- a/makeBigJar ++++ b/makeBigJar +@@ -75,9 +75,8 @@ jars="bsh-2.1.0 \ + freehep-xml-2.1.1 \ + freehep" + +-# Apple specific stuff is only used if it exists and the compiled class is available +-if test -f ../bin/lu/fisch/structorizer/application/AppleStructorizerApplication.class -a \ +- -f AppleJavaExtensions.jar; then ++# Apple specific stuff is only used if the jar is available ++if test -f lib/AppleJavaExtensions.jar; then + jars="$jars AppleJavaExtensions" + fi + +@@ -114,12 +113,3 @@ echo "Done" + # remove the jar-directory + rm -R jar/ + +-if test -n "$start_compiled"; then +- # execute the archive +- echo; echo "Running Structorizer from all-in-one jar" +- if test "$start_compiled" = "s"; then +- java -jar structorizer.jar +- else +- java -jar structorizer.jar & +- fi +-fi # start block end diff --git a/pkgs/applications/graphics/structorizer/makeStructorizer.patch b/pkgs/applications/graphics/structorizer/makeStructorizer.patch new file mode 100644 index 000000000000..b08ec0f30f6f --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeStructorizer.patch @@ -0,0 +1,54 @@ +Reason: There is no StructorizerApplet.java anywhere in the source, no .cgt files and running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.java, only the jar. + +diff --git a/makeStructorizer b/makeStructorizer +index 99a5e8d3..e954be13 100644 +--- a/makeStructorizer ++++ b/makeStructorizer +@@ -117,18 +117,6 @@ echo "Done" + echo; echo "Compiling Structorizer..." + javac $str_javac_opts -classpath "$str_classpath" Structorizer.java + echo "Done" +-echo; echo "Compiling Structorizer Applet..." +-javac $str_javac_opts -classpath "$str_classpath" StructorizerApplet.java +-echo "Done" +- +-# OS specific classes +-if test -n "$do_apple"; then +- echo; echo "Compiling Apple specific code..." +- javac $str_javac_opts -classpath "$str_classpath" lu/fisch/structorizer/application/AppleStructorizerApplication.java +- echo "Done" +-else +- echo; echo "Apple specific code skipped" +-fi + + # copying some other files to binary tree + echo; echo "Copying resources..." +@@ -147,7 +135,6 @@ cp lu/fisch/structorizer/gui/*.txt ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/gui/*.xml ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/locales/*.txt ../bin/lu/fisch/structorizer/locales/ + cp lu/fisch/structorizer/generators/*.txt ../bin/lu/fisch/structorizer/generators/ +-cp lu/fisch/structorizer/parsers/*.cgt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.egt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.grm ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.xsd ../bin/lu/fisch/structorizer/parsers/ +@@ -155,20 +142,5 @@ cp lu/fisch/structorizer/parsers/*.nsd ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/*.properties ../bin/lu/fisch/structorizer/ + echo "Done" + +-if test -n "$start_compiled"; then +- +- # changing into binary directory +- cd ../bin/ +- +- # run the application +- echo; echo "Running Structorizer from compiled class files" +- if test "$start_compiled" = "s"; then +- java -cp $str_classpath Structorizer +- else +- java -cp $str_classpath Structorizer & +- fi +- +-fi # start block end +- + # move back into the folder where we started + popd >/dev/null diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 16365674706e..bf19d0f77eb6 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -3,15 +3,23 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "3.05.00"; + version = "3.05.02"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc="; + hash = "sha256-28osuZnVwkJpNTYkU+5D5PI8xtViFzGCMScHzkS2H20="; }; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract3's days are numbered anyway + postPatch = '' + for f in textord/devanagari_processing.cpp cube/cube_line_object.h cube/cube_line_segmenter.h cube/cube_utils.h ; do + sed -i '/allheaders.h/a#include "pix_internal.h"' "$f" + done + ''; + enableParallelBuilding = true; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 36c4c694a16a..aecdf58186d0 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -3,26 +3,20 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE="; + hash = "sha256-sV3w53ky13ESc0dGPutMGQ4TcmOeWJkvUwBPIyzSTc8="; }; - patches = [ - # https://github.com/tesseract-ocr/tesseract/issues/3447 - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch"; - sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ="; - }) - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch"; - sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw="; - }) - ]; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract4's days are numbered anyway + postPatch = '' + sed -i '/allheaders.h/a#include "pix_internal.h"' src/textord/devanagari_processing.cpp + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index c6acd02a541c..e9b24e4c61f1 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/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/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix index eb5649a32252..86589606ef07 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/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/pkgs/applications/kde/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a..c73f2bba7b50 100644 --- a/pkgs/applications/kde/kdevelop/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix @@ -1,7 +1,7 @@ -{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: +{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }: symlinkJoin { name = "kdevelop-with-plugins"; - paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); + paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins); } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 3c08f1d8a9da..27adbfff713d 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/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/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh new file mode 100755 index 000000000000..aab589fd37ea --- /dev/null +++ b/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/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index ae4a49d7e3a4..5ec64fc0a55e 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/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/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index c34872de4cc5..8617e3454239 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -42,7 +42,14 @@ stdenv.mkDerivation rec { # Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" - "MODSDIR=/lib/" + "MODSDIR=/lib" # At runtime, AMC will test for that dir before + # defaulting to the "portable" strategy we use, so this test + # *must* fail. *But* this variable cannot be set to anything but + # "/lib" , because that name is hardcoded in the main executable + # and this variable controls both both the path AMC will check at + # runtime, AND the path where the actual modules will be stored at + # build-time. This has been reported upstream as + # https://project.auto-multiple-choice.net/issues/872 "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1" diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 429097842630..9bb2a11b7cd7 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -87,10 +87,10 @@ stdenv.mkDerivation rec { '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '') + - (if hipSupport then '' + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"' - '' else ""); + ''); cmakeFlags = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index acfe1d9284e5..d7198461eeab 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,6 +22,7 @@ , qtbase , qtwayland , removeReferencesTo +, speechd , sqlite , wrapQtAppsHook , xdg-utils @@ -121,6 +122,7 @@ stdenv.mkDerivation rec { regex sip setuptools + speechd zeroconf jeepney pycryptodome diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 3912e8d221e9..1405bc5b90ca 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; + sha256 = "sha256-5PtMXipULnzAnarESu2biYOeHSlDeKXoX5XnlpvgIAk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 04b1af9bc2ae..a20b8ab72625 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "darkman"; - version = "1.4.0"; + version = "1.5.4"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-Q/pjQmlyREl32C0LiwypEz1qBw2AeBOZbUIwNP392Sc="; + sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; }; - vendorSha256 = "09rjqw6v1jaf0mhmycw9mcay9q0y1fya2azj8216gdgkl48ics08"; + vendorSha256 = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e4a5e3dd914b..fef4f8ce7877 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/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/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix new file mode 100644 index 000000000000..14bc6ad012e0 --- /dev/null +++ b/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/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix deleted file mode 100644 index 8c68f8672c3b..000000000000 --- a/pkgs/applications/misc/gometer/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: - -stdenv.mkDerivation rec { - pname = "gometer"; - version = "5.2.0"; - - src = fetchurl { - url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; - sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; - }; - - nativeBuildInputs = [ - rpmextract - wrapGAppsHook - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - rpmextract ${src} - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - mkdir $out/share/applications - mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop - substituteInPlace $out/share/applications/gometer.desktop \ - --replace '/opt/goMeter/' "" - - makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ - --add-flags $out/opt/goMeter/package.nw - - runHook postInstall - ''; - - meta = with lib; { - description = "Analytic-Tracking tool for GoLance"; - homepage = "https://golance.com/download-gometer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a03107c2aff2..e71daa754ab6 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/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/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 5a9c5122acc3..3508ff012259 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.6.0"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 09f9b85e4b71..49798c843231 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Without patched plugin shebangs, some tests like t/rst.t fail # (with docutilsSupport enabled) patchShebangs plugins/* + + # Creating shared git repo fails when running tests in Nix sandbox. + # The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group". + # Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days. + substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init" ''; configurePhase = "perl Makefile.PL PREFIX=$out"; diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 4a3262efa4b1..8241c3e98cfc 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/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/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix deleted file mode 100644 index 69092b3acd5b..000000000000 --- a/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/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index e062c35e80a6..022eba1fd6cb 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/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.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; + hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0386b25ee422..4348afb0205b 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/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/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 9a9db9d70f94..f0ed6a07e53c 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.16"; + version = "0.8.17"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; + hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index d1a19eeccc5e..921ae570bca0 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -11,6 +11,12 @@ mkDerivation rec { sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; }; + # Needed with GCC 12 + postPatch = '' + sed '1i#include ' -i src/lyxfind.cpp + sed '1i#include ' -i src/insets/InsetListings.cpp + ''; + # LaTeX is used from $PATH, as people often want to have it with extra pkgs nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 7c27b3b97146..ce8ebef16a89 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -33,6 +33,14 @@ mkDerivation rec { sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; + patches = [ + # FIXME: backport GCC 12 build fix, remove for next release + (fetchpatch { + url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff"; + hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo="; + }) + ]; + buildInputs = [ at-spi2-atk at-spi2-core diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 582d3186eaad..89179b88a8a0 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/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/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 1525fb86f828..f51d9a329cd1 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/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/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 935a9582fcac..e5e0f92ed1da 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -140,13 +140,16 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - NIX_CFLAGS_COMPILE = toString ([ + NIX_CFLAGS_COMPILE = [ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated "-Wno-error=deprecated-declarations" ] ++ lib.optionals stdenv.isAarch64 [ # error: narrowing conversion of '-1' from 'int' to 'char' "-Wno-error=narrowing" - ]); + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=maybe-uninitalized" + ]; cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 7724976ebabf..f5ac2ed7e59f 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/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/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix new file mode 100644 index 000000000000..05cdd0ce5cc3 --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, openal +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-effects"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBEffectsPlugin"; + rev = "release_${version}"; + hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + fetchSubmodules = true; + }; + + patches = [ + # Add install rule + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; + hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rm -r OpenRGB + ln -s ${openrgb.src} OpenRGB + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + glib + openal + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"; + description = "An effects plugin for OpenRGB"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix new file mode 100644 index 000000000000..539c203325fb --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, libgtop +, lm_sensors +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-hardwaresync"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBHardwareSyncPlugin"; + rev = "release_${version}"; + hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + }; + + patches = [ + (fetchpatch { + name = "use-pkgconfig"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; + hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; + }) + (fetchpatch { + name = "add-install-rule"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; + hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rmdir OpenRGB + ln -s ${openrgb.src} OpenRGB + # Remove prebuilt stuff + rm -r dependencies/lhwm-cpp-wrapper + ''; + + buildInputs = [ + qtbase + glib + libgtop + lm_sensors + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin"; + description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ea81b58a2098..bd1664e85ff5 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }: stdenv.mkDerivation rec { pname = "openrgb"; @@ -25,6 +25,29 @@ stdenv.mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; + passthru.withPlugins = plugins: + let pluginsDir = symlinkJoin { + name = "openrgb-plugins"; + paths = plugins; + # Remove all library version symlinks except one, + # or they will result in duplicates in the UI. + # We leave the one pointing to the actual library, usually the most + # qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0). + postBuild = '' + for f in $out/lib/*; do + if [ "$(dirname $(readlink "$f"))" == "." ]; then + rm "$f" + fi + done + ''; + }; + in openrgb.overrideAttrs (old: { + qmakeFlags = old.qmakeFlags or [] ++ [ + # Welcome to Escape Hell, we have backslashes + ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""'' + ]; + }); + meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 9f416ff75a3c..bb1c725dff8b 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -10,21 +10,26 @@ , libzip , libpng , libcotp +, protobuf +, protobufc +, qrencode +, libsecret +, libuuid , zbar }: stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.5.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; + sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; }; - buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; meta = with lib; { diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 56490754e172..ba8324a02fb3 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/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/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index cf8e9978c911..917476023cf7 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/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.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI="; + hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k="; }; 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/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 96cc51fceb78..ca2d75eac853 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs="; + sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index b45854a6d180..2af5e9d692db 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/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/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index f71841c1af9a..15aa7d2d1b96 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/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/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix new file mode 100644 index 000000000000..0638a9d4efde --- /dev/null +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, fetchurl, lib }: +let + pname = "protonup-qt"; + version = "2.7.4"; + src = fetchurl { + url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; + sha256 = "yKc+KOQfqciqULnChVLf6y9npoSYM6Fmu7mYGEKmpkA="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + mkdir -p $out/share/{applications,pixmaps} + cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \ + --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' + ''; + + meta = with lib; { + homepage = "https://davidotek.github.io/protonup-qt/"; + description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; + license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "protonup-qt"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 27f4afb435f8..39a6312103c6 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, Libsystem , SystemConfiguration , installShellFiles , libiconv @@ -9,20 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag="; + hash = "sha256-vJJ3qQb38b0vr7o+7rc3z5wftI6Ko4mJiGLvVzyjTeE="; }; - cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk="; + cargoHash = "sha256-3taLua69kqPnNraIZIesMkFguCbPWTF5Hu9s2Lc02ZA="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ]; buildInputs = lib.optionals stdenv.isDarwin [ + Libsystem SystemConfiguration libiconv ]; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 9480a32aae3d..7987208b885a 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -10,23 +10,25 @@ mkDerivation { pname = "qt-box-editor"; - version = "unstable-2019-07-12"; + version = "unstable-2019-07-14"; src = fetchFromGitHub { owner = "zdenop"; repo = "qt-box-editor"; - rev = "75a68b466868ba41ba2886caa796057403fe1901"; - sha256 = "0zwsyy7cnbhy5aazwlkhd9y8bnzlgy1gffqa46abajn4809b95k3"; + rev = "cba2929dabc6c715acd1a282ba161fee914c87f6"; + hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4="; }; buildInputs = [ qtbase qtsvg leptonica tesseract ]; nativeBuildInputs = [ qmake ]; - # remove with next release - # https://github.com/zdenop/qt-box-editor/pull/78 + # https://github.com/zdenop/qt-box-editor/issues/87 postPatch = '' - printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro + sed -i '/allheaders.h/a#include ' src/TessTools.h + + substituteInPlace qt-box-editor.pro \ + --replace '-llept' '-lleptonica' ''; meta = with lib; { diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 2a00cb92b9d1..e5900a050efc 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -11,18 +11,19 @@ , ninja , gobject-introspection , gsettings-desktop-schemas +, desktop-file-utils , pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "regextester"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; + hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 28602cf0240e..d6e820e06fc0 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,19 +1,20 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }: +{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }: buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; + hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA="; }; nativeBuildInputs = [ setuptools + poetry-core ]; propagatedBuildInputs = [ configargparse ]; @@ -24,7 +25,7 @@ buildPythonApplication rec { description = "Rofi frontend for Bitwarden"; homepage = "https://github.com/fdw/rofi-rbw"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 6b23e2d492c5..6a9765481812 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/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/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index d2978ec7bd32..ec2ded975fed 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/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/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index af8a538a822b..d732fdde136a 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; + hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko="; }; postPatch = '' diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index a7a184e80037..1fb2912d64d2 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.0.7"; + version = "24.0.8"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-EG5TMhYvECXahIbB25gP40iNQpStcrgaJW3ld9x02/E="; + sha256 = "sha256-nxwSJ/rQJYMNrtTWSmqcrJQwMK8zRwIG4jccVyb7OsQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 6f6151d1ea29..99b4b2aefb0a 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/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/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 5791efb9a995..ff20f89574be 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/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/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix new file mode 100644 index 000000000000..9f098efef8a0 --- /dev/null +++ b/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/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix new file mode 100644 index 000000000000..e3daca956c44 --- /dev/null +++ b/pkgs/applications/misc/tuckr/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "tuckr"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "RaphGL"; + repo = "Tuckr"; + rev = version; + sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0="; + }; + + cargoPatches = [ ./update-cargo-lock.diff ]; + + cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM="; + + doCheck = false; # test result: FAILED. 5 passed; 3 failed; + + meta = with lib; { + description = "A super powered replacement for GNU Stow"; + homepage = "https://github.com/RaphGL/Tuckr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mimame ]; + }; +} diff --git a/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/pkgs/applications/misc/tuckr/update-cargo-lock.diff new file mode 100644 index 000000000000..45fe445042fb --- /dev/null +++ b/pkgs/applications/misc/tuckr/update-cargo-lock.diff @@ -0,0 +1,49 @@ +diff --git i/Cargo.lock w/Cargo.lock +index 5f5dd43..d7c8370 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -107,9 +107,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.1.4" ++version = "4.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" ++checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" + dependencies = [ + "bitflags", + "clap_derive", +@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + + [[package]] + name = "hermit-abi" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" ++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + + [[package]] + name = "inout" +@@ -319,9 +319,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.17.0" ++version = "1.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" ++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "opaque-debug" +@@ -597,7 +597,7 @@ dependencies = [ + + [[package]] + name = "tuckr" +-version = "0.6.1" ++version = "0.7.0" + dependencies = [ + "chacha20poly1305", + "clap", diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix deleted file mode 100644 index 690dd9d64ad6..000000000000 --- a/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/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix new file mode 100644 index 000000000000..afc810003932 --- /dev/null +++ b/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/pkgs/applications/misc/tvbrowser/test.nix b/pkgs/applications/misc/tvbrowser/test.nix new file mode 100644 index 000000000000..b5d12ac6bad9 --- /dev/null +++ b/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/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 4911556086c7..839b100383f5 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.8"; + version = "0.13.9"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-oNsA9VM6MN2czeZSTFGvmCWX0T3iVaAhQk1mVRyKgWw="; + hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-LG5gTHXB1ItDZFbTBHyZGHZLaSYb8wekIHkahTMXzkk="; + vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index a3af42c0fb84..5d9965c0d14a 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/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/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index fc66c908be70..bb498c7ee237 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }: +{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }: buildGoModule rec { pname = "vhs"; @@ -14,12 +14,11 @@ buildGoModule rec { vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ttyd ffmpeg ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index 6cd7be52d5ec..cbe31867228a 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/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/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 9ae1b348e3d4..499f1b44db4f 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; + hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 16c6bfac7ed0..32b53a663d07 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/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/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 7635a9ea7e49..05f5b3139026 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/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/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 1040451efae0..461af3ca669e 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/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/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index f217c7b0e9a5..c7dc0b6071b0 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/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/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index bac11b6899b3..dde9f3b69862 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/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/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 0cf50c96ada9..3f62f3381c55 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.10.0"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I="; + sha256 = "sha256-3xFJ7v/IZQ3yfU0D09sFXV+4XKRau+Mj3BNxkeUjbbU="; }; - cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY="; + cargoHash = "sha256-3Sw/USfGJuf6JGSR3Xkjnmm/UR7NK8rB8St48b4WpIM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7a05c9f9b18d..77c626156427 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/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/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2f39e82f3b24..1eea3e8962f8 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,9 +90,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") - then ["aarch64-linux" "x86_64-linux"] - else []; + hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aea178a3afc5..b79c69275adf 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, libffi , libepoxy # postPatch: , glibc # gconv + locale @@ -149,6 +150,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy + libffi ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] ++ lib.optional pulseSupport libpulseaudio; @@ -291,14 +293,9 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - } // lib.optionalAttrs (!chromiumVersionAtLeast "110") { - # The default has changed to false. We'll build with libwayland from - # Nixpkgs for now but might want to eventually use the bundled libwayland - # as well to avoid incompatibilities (if this continues to be a problem - # from time to time): - use_system_libwayland = true; - # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; + # 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/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e12667c94f78..5fb50dc6fec8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/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.100", + "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd", + "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr", "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.77", + "sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20", + "sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00", + "sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn" } }, "beta": { - "version": "110.0.5481.52", - "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq", - "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r", + "version": "111.0.5563.19", + "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", + "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza", "deps": { "gn": { "version": "2022-12-12", @@ -32,32 +32,32 @@ } }, "dev": { - "version": "111.0.5562.0", - "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j", - "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm", + "version": "112.0.5582.0", + "sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk", + "sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c", + "deps": { + "gn": { + "version": "2023-01-30", + "url": "https://gn.googlesource.com/gn", + "rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1", + "sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3" + } + } + }, + "ungoogled-chromium": { + "version": "110.0.5481.100", + "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd", + "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr", "deps": { "gn": { "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" - } - } - }, - "ungoogled-chromium": { - "version": "109.0.5414.120", - "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj", - "sha256bin64": null, - "deps": { - "gn": { - "version": "2022-11-10", - "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" }, "ungoogled-patches": { - "rev": "109.0.5414.120-1", - "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3" + "rev": "110.0.5481.100-1", + "sha256": "02bmlx2wk9jiqm4az7g8r5ycmpgm5pkb7nivpx2jbmrb0g3qcx9q" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 72767f743079..aa6aab0b668b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/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/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index d0ea4a8b490c..74c92744434e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0.1"; + version = "110.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ach/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "08fb9040a6681d54863c2ac8c8ad48abbcfd5b410c8e404dbc20f425a69ae8d6"; + sha256 = "c72ce8417550e30d74ce76385e5261f55f3c1ae62c334e728d16ca75e8a8412f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/af/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20635ad665612d861c0db1f65a9b1136709e88ed689d2e2679b0560d66462df2"; + sha256 = "3bffb9826cbc942c7ca42c09941dd38f5b52200a7f55203a333275e017debd44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/an/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8c9cfd7259112727f149ae26af915e6fae9e35f0946ad052c348bc491d712651"; + sha256 = "7f25dcb3f0a4adbfabfd445ce08845925ff349c01f4afe3f79a259c6d9eae9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ar/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0541aaa6c8c01ad265309d5cb2a8ff886456b9fdfe2d91c86ca7fca2eca4ad5e"; + sha256 = "41314e2e91927f9489e51607266beac834c844e364ab959673dc4ab21f40c490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ast/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0cf0e3dbd210aaf5c86620e71ae692ff2afe70fc4c23ff74bbad6f2543f1747f"; + sha256 = "164934479c770e028dcddbe73396085d216b31d9b3001de76210e3c82f836921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/az/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d241210ca9644a4bb285019b1b0df189d741330b45796b33f0ec304f2a994781"; + sha256 = "2cab918f71127f01a1256f0d5bcaefc14c468cdffa212a9af3f9341d77737ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/be/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1b6dee177af6899f90e37155a778db6a574aaed5bda9b17d447506d33ded9e68"; + sha256 = "70b301bba2286c9cf9393b62f1e6fd7a9a5958c69ad0070c91928b1ad428f9a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bg/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "312ef6862bed28d9e7f1672d9614542c977c03dee68823b879087281fa294e8b"; + sha256 = "f1b4d07e3e983fa80216845a9c236a57c0b8cca2d3a343d16d5cd44c38059381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a3678a881c81a74f443796662d98f516a9c38067864d14064cc8386055d88684"; + sha256 = "c5363c0d810c34e4669742b114b1c95c62e5ee9f89158a0e37d2a30d8bfa02c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/br/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3f022392be45e43edc220c4b27c027f80a157af237e94c5ca3bc201f1e43e581"; + sha256 = "21fef420a858a6e2f3cbe145a274d2660dd59a486dda5fbfd8dc2da1bcd6b6bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1eddb9e5fc279d5a265829ede15e09a7f254cff0a669457486f8c350a3709753"; + sha256 = "93ac6bd8c45004f0a6768df878b3274d42ac6124e4fa4abf3fd851a360d7c5b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca-valencia/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7ec65537c9b3a2432a5ee6b4491c36bc4735d0953c47fae62306e4701353a698"; + sha256 = "fdff415877cb7a38f293bed3a876cfeff083eccf50408afded0288276a097758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e726e7df71d65170fa9fee98de05aa5b5b6d1a3192bf0aa49f76a5a8fa2fc0ed"; + sha256 = "1504757a058e3a634fe633a5fc768bb4240ad15949d6769408fe0bff71a5c17f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cak/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2722c5eed7b3e017cd8c0a626ee41190e0b9ec44692a1cd8fda1d27cf741acde"; + sha256 = "8e791f14a2191c48a0ae92773f8653ab90f54faecbbf81dabc065e608f92a511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "fa2b9278c64974f8ed61b58ddec23c7893d6b473ebd29ae900f45076944cd484"; + sha256 = "dd6aa73a0770070b26e9ff9a27f0aa2579b32cfd195f0d65b728c92f63a4c559"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cy/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ad6b74b20d7b4ccf7bc858133fe0f35fd7239d4eb09aee310c75828c20face8d"; + sha256 = "896b82fe251ab1471f4bc9f5c37f1651a9bd38cfb994b03f34a984b46a2fc29c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/da/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8a0fba66e139ef6632b845d6c7ede425a28ac18afd916e0ff4fd89aef313578"; + sha256 = "1a402341c4d8247af3197cd566e07eb367cb7016c85f49e96be0228e22d1a65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/de/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1688dcf426f9349a0a89e010dfe73ae6e42d590695b8955a257ff1acaf5ec95c"; + sha256 = "94b9783c4b13ee4eab1e8abab2a534582b01463d6661df0d9a56d29448910a10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/dsb/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "36c8e7c90e7e418ca96a2a09f85ab78e45ea733369c2f1125bd100179bada452"; + sha256 = "a1444709346d8383c512ab3143d4e41fb73cda71cf37aa61ad996f6ba2d074b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/el/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5753c87b6676e2a21169ebc4748765f6a26bef8bc739a33da6421be6e0f916a0"; + sha256 = "d317b8a632f0d2c085d11458744301664d2b0e4d386df9194b7f6ab3b4c7ed24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-CA/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5438c21484a9de673508f8d63fd61bcc58a3703fc1b1cdecdcaf30f8eac8d844"; + sha256 = "3d955a100439458b7a668062d75cb79bc0e9543cf51f21fa4c5690865e19ee85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-GB/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "bd19d96501d872f004b8226acc929e41fb4ae4120b287dc3504e1f0c6f733e8c"; + sha256 = "14debdcb282b095b127d1575c6b205a925ffd08ec0e1980146d51afb037391fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-US/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "487a18ecbb0b3b91e402b55424f429d2e4e6127696ee48bb0e60ce7f9879d581"; + sha256 = "3b3b615829a5adfaa9c9d7cbad4f1460e317650c73d2efa54823bfe99fa0f7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eo/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a1f6f5b424d026f4e59f51a0e5669bff1bba225100673e12595ac263509ffee1"; + sha256 = "93dd3e6467dfa466138b92e2890bd95d253d780092e9cde155ce93fa4901f4b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-AR/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5aded9fbe24aaf8944fc193e507cf267e964e935ead5a628d6d8638c18caa02c"; + sha256 = "aa7c81d1420dae03592d75d68f7d3d761cd1d2e34e55ab20ad08f4a94229935f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-CL/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "bda21832e8f1a05266000cd730a7698f99507e536a1690b3b69387640999e3b0"; + sha256 = "dae84fc91b87bd08f19a33ba0c398c33e54b9c0d64cd77ee3c37500e5e5b9f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-ES/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "23b8e0f6fadd1523123993469c4919188166b2ecf97cd63c36fae816ee50ebe0"; + sha256 = "55deec771fbb3a6e8653250a2d578df7bee9cf20ad3dd326ddd7833627917f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-MX/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c8ec680aace4a11ef6eb921466ca449d6f9f6cdc5f90ab35bd4d65a650f0322d"; + sha256 = "ba20aadf9c0137a3832466d3de9183685d37c25bc13de3fc64ee9407ddb92226"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/et/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c80e1e1b9c608c9757b25ac2482ddef919fd0a6130fc11122cd9d8d975b015f9"; + sha256 = "9c58581144a916ae7dcfac8f621a9e406d1a889d007e13ca7f32e969a8da6a4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eu/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e74d5916170b90af04e27cdc1a12ad0cb4037bbf56944d41089c58fc5d731a7c"; + sha256 = "39b91be1655603dbf4034766319b0224b20f198f66a6fe43c3ff98c438336f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fa/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4d22b6c6e8e197a431b7250f864837aff3538f094fd8c58179e92d00e3f52575"; + sha256 = "3819f09ab89abfc79a8ae4a9d676f778e19f3cfc120d839e8ccd1ef6ece49373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ff/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "9569f1ec1d42b743daf74d671e42cba98cdad204ab4ca1c2c69c5c20b73e3292"; + sha256 = "653ecdea0b79d7d489328cea7412dd669d9b25b896746d4a60a9415364923d87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fi/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3b4dee8164333a13591ef238d7e33dd111f5da53975ae3cf3f70d1ad852f9eb1"; + sha256 = "10fd36e7667d50cc5ba894e1fdc3ac56162740b29a4534e548ef4a4e1f310ecc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4731923d8ec31c32e9d563e991ff4cdef6b36925a482b2b0dac43aa3ca17e1ba"; + sha256 = "ddfae62fa495609806dca19019fa238a0598509f9655bfc0a8c93d182f15da59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fy-NL/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ed36d87989fdbab969463b439a6a82a15fbf5c986942d92bef634722127b77f2"; + sha256 = "1f7caf327e63404450d46ab22500020038db953a0465b5b79773e43220329085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ga-IE/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "49b9d7741cda331568cf660151173b67b09e2bb559c4c8b5398100573629bfe6"; + sha256 = "3384a63147182c194e695d806220aa32af8061425ecb37a02fbd7e492110a355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gd/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c4523729d1a51b91322fef8b8d0d7709ffd3dbc74da6ecc019c3e19d1b5e5fa2"; + sha256 = "33bb81bf197174ed0adb11de55b48ca9d14babdcebe95f18cc2b80a3946e1f8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2e989f3a162c52deaaf66e3631b33a275b906c402d2ab9025bba99ed1d76735e"; + sha256 = "a4a0f1b2dec71806eb3e7ad6ba4512453e7c2525996ead9ca60e5394850933fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "aeae4daa675292d4a578d56bfa0771b02f17166747f377e2205e07ad6e11cc87"; + sha256 = "42da1455925d9f4159e418f3af8c4ec6ff339a9b0fdc25de2d88df4b54509efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gu-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "215e062675cc04c904f1f91b539c1653ba5585c030446429b63913d92b3c72b1"; + sha256 = "3f18fecd672dd5c06b2a2513686e07bfc9e52f063b5a00a42dbe984bfdb88069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/he/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9c48fc2af47849bbaa958f839b25889159265b4575d286d28d2c67382fd7c2a6"; + sha256 = "312892d542a391d9bd0b25895ee4db021f0178925972e9a5a5c453d42587dcd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hi-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b57213ad87c537626022504065209f7ba561bdfd7eef621e49d47db28cbc35d3"; + sha256 = "bc1a49fe3a05d92108757072532fb557bd0e9947ff7c01f57cad8f01a06503b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49682e92d31ecd5c3690c30f756f719acb959440853abb3d42d6e87a98e8d9f7"; + sha256 = "3d8ce1cbb3ebf2ca895f970ee1be35b8c02b177cf9cb7f2493e40666080c6ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hsb/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c1971514830d0c2ab026044cbbfcad679f82c612b2dc4d36604b9c6cdb8298bc"; + sha256 = "4e99600d501be843252a7a1f494b7f1c70d4ce464ce04a0a4fe7ece35629bbd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hu/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a63eab963d13bde89cd6f52f5f7a35946d9a32572c6a7201ca7466a679ca1dcc"; + sha256 = "bb6367b61be3cc6db54e004f01582a1ff20277dc34eb79a5a5cae38aa84b0ab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hy-AM/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c563456845b5413fcfe160f23ad0d6c6d92c540a7896c6d6e39ebb61af0d6295"; + sha256 = "086e6a14870ac92b5b31b61afb8797d5ff3cfa42ed0d70efe7c8950a1a3ee4a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ia/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f9af71feb2085290fbe2f3de3dfc11bee0d0ac49348268675a5f7bbbbce00357"; + sha256 = "46cfd327083006a11f2d483a6dc8bb1cd70cce447b4e0cbe400bd2c0bbe96590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/id/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9996428d29e3705cf35e060f860660778b69e726cdc57e2734a42d449c43ed4b"; + sha256 = "32f23f73a9e531bc477f853c897641b3539dc39e53d5a718bc89a955ff7f9791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/is/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a57421ce14cb264da4d8bed35dc3d0f742a15870d65548c7617fcad67a3f50cd"; + sha256 = "7b9f2dabf39e68da0e7027d177bd717f5d59f7567b5c3ad77803a32273bf1b7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/it/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e2f537e79f258b6ecc03715bd18565c18c10332f836ae8582e6ddbdb567e96fa"; + sha256 = "f1a54314f7ffc8ba0371fe2f1f4b178e748a32928f056a36b24757d4faaaf858"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ja/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "757ae63ab1d7aef781b24fdcd779aa84722a4dc0b52c35e7938158dce2b56fa5"; + sha256 = "2fa4839150382a59f80e72ae9939c41a5ec5be262be2816bf1986e644e326603"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ka/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ab985686cf54f50b6cb69e63d121a71c2aacfc4b1c4c22d197e0b6b4d24fd404"; + sha256 = "453f380f21f68665138c2d45cf5aac474a20aad2739d81b58ebffa54069422f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kab/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e423f60a7c486422a4583dea6f454c8f43ed67cc3ebada7ee614465a5dde2871"; + sha256 = "6521279e7a1a6c1b0dfa40cc16a32318fe1321593493b5c3360aeccc0d3d317b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d79b6d73f0c01ba881ff6ab63a243955ffc60428ab6f3ebe1d8ac2890bfd81f0"; + sha256 = "f2230f6e952f55ab1ee9883a9310ac64280b28d9602b09a5a09837c5b7507230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/km/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "afa093cbcacccf5e93b4305cf4cd6ce80b2183e11501d7fded6ed71b8dd61779"; + sha256 = "1c7d9fbd2bf87cf33655b6fb52615f4014e1737cd130fd71bd669357774693c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9bda025646837a816c5374e09ee0f6b8b3fa4401adfbb4c79bd37b9b004c1388"; + sha256 = "e591b6c5bc5235551379bcc99b2ac24a85a9d4da5c10a6561fe3812ade7f6f77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ko/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3f56db587b78bcf927df9f7308f4eaff8087bbb6008bb7dbc63e7cdcf4727c86"; + sha256 = "8b72677509748f44c45b176005545d5f601c4bde2259134fd7049c864b772005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lij/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "75da1688b606f59513e21ab86775fc8cb35ce84e09bc042c6486848489e022ff"; + sha256 = "796a16bd6443b729e0158d6b628e03a92b144f742d4d4fdb0bb1410a31a6fcb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lt/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "232bfb865f1c25c8848bd8699b91e2bce6832ea82ae2e2ae647f43a83c828232"; + sha256 = "83cb607213879da84e38930b4f1cb24f9cdc89819a4d88bd47521d8833afe9f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lv/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d4834008c21d312286d6b9757bc2b61497d987451245445919aefa4a1ab91be6"; + sha256 = "0498de6084df452c66f05f3171d42628f41da08772646cc99c32e8672697f3b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "102169bdffa3fbb210d372844caff0fd010511fcafbae16b89453751ad9f7228"; + sha256 = "0d876b466dec448a88b5b500ce1ff8cbc644e914ea9fe90f1e3dc06a97a403f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "af85561d4db729c04b973f8c74bac790275913586c0cf5284e243c0ddcf45ad1"; + sha256 = "cbee1c85c3c01b9fc6a7a919ccc6c8dbd3dd0e895e4db6031df55d6ac32af9bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ms/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e98ff53a524ba73184bc395c25ce110ae915846a44e0ba8d8a6c594d5da33bd6"; + sha256 = "3623b41cb35d37c1e197e67d86952b4a16a3d272559fe4e3ff369573fad8b44f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/my/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "82ef41b18753d8c2203fbaf3cceb0d1bd179004113db40079a75488b3fb7217f"; + sha256 = "26d6639caae14b3232a04984d43e5625e421c022c374380edff1048cd86d5af1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nb-NO/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "daddf9f5e0e9eb654af24dc2abb210cae97e37faac8af56746f1d28f5dddffd6"; + sha256 = "26e90b20bc065c55a18575b48fa1259b6389070de5d0d858820d8db8b95f2afa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ne-NP/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f1b97800986e546fac4c08576469651ef0c0f6e8729b34ec5b1876208c788876"; + sha256 = "4723431192b87bd47b3a2af545b106fce88025a16e9035307fde91215d21d161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "30d2badf5c909890877c35dd1a397ee7947546bc97867a1369572070c3c421db"; + sha256 = "f0b6bb64108c1166655cafbe152100305b24717d5c197cdef9b9dc18bac40fcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nn-NO/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "378bd3b106f63e5ed28ed150f83befb1ed0624dc6d977a56ca70d7b53999489e"; + sha256 = "bfdf81ec059be8e95434c4fa50882fa8be785bd6fcb7af5c33b864bfaf0adbb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/oc/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "bb6eda0d45cd29e1438034a1f62422da500ff8db12790eb140fad34fb504dc22"; + sha256 = "7c1361df3ce4c84340d3561d931d1e567599a65f97022b33dc83af2c9db17c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pa-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9537fc5b350222c8a44da6387902cd7c18ed1d9a0dd45f65ca996819cc88ef21"; + sha256 = "0917326d1b70fd5cf3b759f1374eda0d69d538f92fd571df06df4075341dc633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "622adb3bafab1594166856363d317d9259050c935bc6b2aa6298b664b9a8e80f"; + sha256 = "d754df80e43a6d00309c867e3b926e173ae895d652ee629d6646cb4481531190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-BR/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cbcdaa340edcf86abc9997c7bbc8eac879e7ffc93d9351fb1ae2c133cbdeb56e"; + sha256 = "d06263b565d014ee2d71c00fe4b4a4d020efc47a2a8d6dc9687b983e19b8752f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-PT/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d5662ca239edbeb332308465d16cab2371da282dfbc750657ef3edf80030bc4f"; + sha256 = "72c66f0db72dc4e631a9d9a56e5b4e2d03779326deb501ee42011199148a52e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/rm/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "50db6ee90b2197bdd6a24a18722ec645844898ed0fc1551a22a0837a2ae98402"; + sha256 = "a1e5e8f6d47aa06e9c1d9f55a014a9a117658fed802302d3d9baada236f2807e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ro/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6a8c6b76ab243da8317d1f1ce26c4d325b8a415098028f6162dc3523e78c0f32"; + sha256 = "977766174f16b7f1173f671d9ac3b13c49cd4a3ac4446796322c94e533148c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ru/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7d026e34d5bf90bb68e6f14b6954f1b7f9ec132d6a11507236fe9951301d7ba2"; + sha256 = "c592b9ebf9158496d7c53f010c30934b05f6c24c8ab975bde5cd982e40131666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sco/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "457fe129188f2abcbb6cd1fde7fed8947b5ce3367bcbde11a6308ba9f769bb81"; + sha256 = "c44f03fb44368f2084ee4fa19b16fb2e2c886ed8289888fbc0a8ac81ae157e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/si/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "bbd6af1251c794090d01a0a07fccb648b8b4e210f9991a3d2937d1e663e99df8"; + sha256 = "fc7af71d586bcd77b9773d8d945deb0a8c461d0d244d3a9117c4d6a9eb16748f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ff93a35e6be55c2a05e061d3b2c8e738a1f408d2876436c168421eabbbd9d40f"; + sha256 = "f6ca007bf45d7dfd671fd5de3b161da2dd664552d78734024700fc54b396450d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "81dded9e76f3a95d5182dcd106671bf864c33221f83b90c338aa16c72b7edd7b"; + sha256 = "f79577182cdb35fce6089a54c3773369400d611466dab19355ff52bf705f1053"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/son/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d70271b8199efc1507c08eaaf96b06523dc9bd6689a3884ac556b0e3a252ca60"; + sha256 = "221a3f12335129f3bbb8674b723041154b144b00f752680dd8f1ebc98c2a37f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sq/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4a264563aaa4cea44e54ab9ebc528dcbc241e41e0a12d3f256b2bc15a365965e"; + sha256 = "86a093a33be1a5f626455012a43c4a50632bbc6ec990a114979da7f3baa38e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ad119b58327106fcd2154b56952d746add490f77a146c7b7beb44310eabdfa80"; + sha256 = "38f947d02fc34c94dcd6cedd38cbfde231ec1131a5dd6faeb34abccd960f1570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sv-SE/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "34a6c91de77b89a781335c3e56326fe84fa214e7d847d6450eda76cba8479de8"; + sha256 = "707c1ee6d11af079ba860ad86f1f2b54a78c70442e9588d3d2ad807271914bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/szl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ef83c2facb462e2d02f568bb4f01817715a5df53d8ce248a222d11744e863f65"; + sha256 = "991af9e776cbffdcfd88b4e2ff30660af04a16a0bdedc747d2d95bdf81162267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ta/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a01a5ac21e4089c0a7e2c4853166f6f48f7e14d4a6a28b13231bb9afda951809"; + sha256 = "b59fb2732574a1c44047ae8258597585661229dd2222fb53a485d3a219170cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/te/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a565cec206c2f692e704b7c7264147ce45452c82d541132a422e4a3224cbdcfe"; + sha256 = "9d9266c5a8c2988d7db74677e4d921d26c6b38445580be6caf6baad95ab1fe6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/th/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3144b8ee44c820a09197c45c4e40918283c8a7ea98c4a77f46b827cd2ea15820"; + sha256 = "6392a911799bed85022b659d14cfefc9a28d10fcad968316a888a11d78ef7e00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "dad4a9b1658f4eadf87ecf14156c19767294e7ce3fc9ec265d2d11cace33ab3c"; + sha256 = "cac97ac6f2f6eec124219479fca50a0cd9730a3fd6d501285f4a03b1d4f2a9d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1659934b3db55eb38c5a40201b111ef4e86b7ef4d2dad3e9e4528ea28101ab4d"; + sha256 = "19874a19ed49e6320ca5f65a9ac9f30352abb0c417b6d637548e48ba4e4c67f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/trs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9393d4ac66d6f4f23426f7432febee1498373dc6ef3b9395316a9c2fcb9b915e"; + sha256 = "15a541c0b28a8af82ce1b736798850016ccf830fcdf3ccb80198e929613c39e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22f8886296e49d947f33f984688af663c9cf13a7afc473976e9975cdd70e67f3"; + sha256 = "4afda83040c0353244f55d3e3a498680a1d2b96cc36b97d2b96097d29a87ce1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ur/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "883271dde81dc06893d76d65b394e639ed74bada7233ddfec015c5a9c76bb9f5"; + sha256 = "ea702e1ed8c412631b5c2e8996bead1a11eb54d865eb1891a7e5346d332c5af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uz/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bf71ae490fcd0c1e03044308e0322b993238e679d1b33f2214ccf40bf03d9075"; + sha256 = "6173fe2d74b1b5f776a8d1fad92b8a629888a7e7a267d49a9296a4728f46c456"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/vi/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "07ab60fbc7a9422e37e2a606962b4f52d047a346d1560e7d88a28c58766a1cff"; + sha256 = "88eaa69fea116db05aa2adf3e0b89b2f5707bd83373f7fcbc72f758ca293a0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xh/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "55a4700c96ff4b73643422a480546201580a0cbd8314434f3a0064f992ee29a7"; + sha256 = "8869898fa3895eaf2749b414a518f2e281e813771505c1715b077c155ef7c6c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-CN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "645c75f0f4a39370966c959bb81bdc1f512b5c10be7d66081dfbafb978ad2851"; + sha256 = "c400f7deba6435524ec1857da4c8824de621270060441721e4d63bb4152c414f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-TW/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "91f28d74e5c626b0e2f540aa2b0a0232a9f27786a296f4bd2b4d72d7faf09b22"; + sha256 = "3d0153abdbe3ff6e6a63d748ebad7974c869b8b862719aa141b5ab3527e7dd85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ach/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "7c3b5a5fd67548a8d56faeaef023f34eb7a7853e2d9f18628c9588672b9d608f"; + sha256 = "a497c0580b1b85875528ec193d2a784c264b27bb0f386b95b491d12ef6793dc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/af/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2f3221f6718981b341655d62913f7413b75d41721ab002f3bb885dad4c40f1e3"; + sha256 = "4c4ef321fb862c8ed35ae41e3d9997f304059bfda060b1d6cafb4a5cb9d3844f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/an/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7d573fa13a00c255c5c449521162ed85c733e9648c0bf929556bb97436cc12d3"; + sha256 = "3af27b88ac940b664df13283d34a02d8f673a6474642a1c1665af249d6249c19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ar/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a544d38f3c4693413ff3498dd6a89766154974087f966da061a9a42785e85682"; + sha256 = "cd533794dd488430858c800f81adc2d0ca11b6c9c882d6b00eea77cf65d59818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ast/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "325b3237da08fc1a637c0409bdb43161781c1fb7ebc811fc3a477372b34eba63"; + sha256 = "94859669edd14bf395d298872ab4aa6e75d763c893304c1e97908baa8f84cbc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/az/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ec6800b785fa3b8f4b7c2ec0bd4fd7d06e265408a12ed791ef6198b0c1786255"; + sha256 = "5f97dece71f45eea49b09f67d86e42f8a32e4c46f2e6028a3f9570fd976458e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/be/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "aff9ef285a2b08bb3e516c30b85c6479d935cf40c998ce88c5410de077e42723"; + sha256 = "c0d5aee80966ba91f56c9d4c5378ff8dcb49ecf1f39734a892aff19d48d1f618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bg/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a27357ac9c019efa327406f1919eaeb1fa5a8686094026935283df4dac50e96e"; + sha256 = "427ed2a9c099cad19730f749fadd78a875f36e90e21967664db0d0d78791d821"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1642db7e385512fbd963b48bdb38a1780cb5d4be98e30727d6d2df751fe262ad"; + sha256 = "b447ceb654fd80ac6f02ec6100d9b05a8e4db3b88ccce18dd73b568f4a8a79bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/br/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9bd3bb35f392512f77013068b3bd61eafcc08fcc2716fcc13a996b54f8881469"; + sha256 = "97c29e25546631441e8e91f5101ebe6b38580baba951ab0cadefef6da100121f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8fce6f5edbe7996f8d31478b276d6e80b556a01913a158d403b8790262e26bbe"; + sha256 = "80515bddf58da59418d3cb4c815deb27a32db94d29087ffa2abafcde0d8cb697"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca-valencia/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "fd8fa093fdae77f9ed588543d7bbf00b1369ba5e469199cdaac2bea990be8d5f"; + sha256 = "c72c6c12bdbdbf438565e417dac62ce2fbbd10a69218d63f424a8241186e1277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5e479179164485d1e4580dd9f25257067e4ee30ce00790f722f61024c5cc0e8e"; + sha256 = "42829bdbf409d8e96c1feae1283fc81d892a8c8c6b7ec9a22eceeceed9c75f60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cak/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "00dcc222d9bb3a2e68ecb8b61e04471f03e03df7e171b03c390487a66745bea7"; + sha256 = "e304b4f56407efedc4ba830f8a8baa4ecdf1ca597c85be6cf03ef7208a420c63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "62a42f71706a8f02b2165603ad9ad0f6191fa4e2278ac2a09d8337ae1ae809a3"; + sha256 = "1d8c649087ddb30988b8efaf94d12f287ae6670ea67c3e5602414ed296d01b5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cy/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "36afec95e09e29150ac3d6f2e75e451541ae5e223d438a3c3917473ad7d3c8a3"; + sha256 = "3594d93aa8b4cea7ee5783a2ac7c8d2d19a2b7a75a8f10b5e647564583e4af85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/da/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "03f36a41a0fb306c26da2b9da19ecfaef4b78b7891dcfa23f7d95a334cb7fc39"; + sha256 = "e5358082beb94c367025047503ed28e6fc9daa51b581613e680af561fecb3e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/de/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d9c4c368d31690be710648d41253481bb2f9e590d10bd8729a06a0c00b1427cf"; + sha256 = "c57baa7af49f8b07b9fe3cb74d3e6110d217c1f0c3fc8c061a7ca6259bd0db85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/dsb/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3177bc793f513a2e6a52d8d8a5dd45f0cb41257e524da9e89e292664dbff8cc9"; + sha256 = "4bd06a4df2243e392c0f9ed7976c38b85ee9cb413e50cafaebdcf48008a1b7c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/el/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b25dbabf9ef58de514edc92130f6ff733aa6a0d3b4b2f70e3b72c54a74a37ab2"; + sha256 = "0e322fcf17bc6abd90c135237c199ce9a6979954df947d07fdc926a90e0f751d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-CA/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0232243fd6bac40efd17f71295f79b172119ae58d277f3d8726df0fb7913afca"; + sha256 = "8b4770349802e264d61b228f64db1d2c4200ddde513b6e88277e14c4dce3a5c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-GB/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4ecd5a129e40b9938f4c245616558e61f49c602f9257dc32417af0685d097ed3"; + sha256 = "f36879cb02a912b6b7023a55474a99edc1cbcaa3174c02a23f5c861d91945c25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-US/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4a960f440dd688eace3d4ea57d80b53ab9272e22688e08d773a3f5f7b9d53af7"; + sha256 = "b9c800d918231e74e6ddcf6f5ebf54e94440f03ede36221b061de65e9a7ef1f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eo/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "07f66bd4e09b5fa459a29bb5576818437bd5e7d059504e9b0ac8eade2045d263"; + sha256 = "93a77d6696d8825e1a16eec1c757f7b35434976980dab488ddde7096e3b19efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-AR/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4d4cda4d1e4d189704f3ff43ccb247dd5d6b05ac4d74cf7cd957d0f25b2c8c5c"; + sha256 = "cb41a835bf688d08ca346e6bdc12549d63741acc87e2c3d7fc9f11fbaf8f9c32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-CL/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "48a18cadb63917659697f99872c40dd77c09e62d4687e5e15cb8b791d4c0a2a3"; + sha256 = "622933f73c63dd4da300677ca1aba7729b615ccaad3f820eb66ec5241ffbe4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-ES/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9e73d300963872b32ab69c42277ca0451c9e0df0ec3c7d7ad1ecc47232cd4388"; + sha256 = "0659f2594b695a7be000d0b1901e50b58a9d561f57f0ae31ca4c4b3c374f8d3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-MX/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "2b1a4c7a40a62801e1c5b8592186abf407c4e9c7ce868263b478bc8fb352a001"; + sha256 = "ce894eae045e3b09c9c6dfa2754c5a03a6e737bc4a3b54a78d48226cd5376048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/et/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "5d0296cfd5a62003b90a8b20baa8bed8edac5a0bcc093b7b99f96db02541bc46"; + sha256 = "dda98cfd2833dad0ce35be8bfdaa34facb3fe6a68117303f373b099fa65c2b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eu/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0b89fb09487f3ecfeddd6cee16ba4547f0a80e4afd25028b08298507977e76e0"; + sha256 = "44c0a2d50e10d826617399abf3d036619576b2f5fa3e97b5443c38736cdaabe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fa/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "09d98823bb9d81314668c05ef061bb2c4f576476ed74ce58f268f02f3375f58c"; + sha256 = "f3e2b415e88ecc7f1b39652ea08d217a6450dbb8c7991ac2fc21012c6bf485fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ff/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ef929810e9b4294e8aa7f3768adecdb79634edca060e028536e61cd4f90b2445"; + sha256 = "fa72b60e44b74aef447c491bc3d5691293765d6d29f0226b8cc703ad683924cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fi/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fd6564352704bdba7f329a70c940514f3b060d3bab75ca7e5a6198858db8c79a"; + sha256 = "be6cd6db910aed81fd5ee10f96ec9726b64dcc90301e747f2881acdf04693c21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e1b30692bb0dd98adb3e3f057e988d88ef671bfe84316b7003e465a7d5dcb007"; + sha256 = "813fafbe4ff568297f58a2a6f98274681c643953ecc27266bb91cd83435eacfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fy-NL/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "16bc416044cc23ec59a08216f1c18f9d027e141a96f05782eb46d96d799c2b19"; + sha256 = "ceed0527d8176a1e04622e7a0d342890591619bb0907eff75f9eae6f8ca912d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ga-IE/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "64a13f28131b37f84f37b82a0d07371228a20b0f9c8a1e228c47a8d5dbf0e730"; + sha256 = "26be4251150549246fe36db06dda749aa7f653086c8a3d789f296b638013b49b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gd/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6fb5531c93043ea2c11b029d13e88fb8eb4f1c95263c1fc324a3d8b7f545262e"; + sha256 = "abf2fe88921b3b84390e1cb85e0e7dbd0bcfe4f9c3fa20ebf4dac0a3b673caba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "15bb2baabedb79fd3bab8dce240ce2d0c88f6eb986ae467d1ee8e43ffd077195"; + sha256 = "630ade818c30b683eb68a9da6b56b38f5463aa44ccb2cca0c2fd095a18e5ef32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "48d50a8cc2bc3608c447b7744093166d4c2f740e8c519d9b6f3931e1021875d5"; + sha256 = "8765e1a9cb4d63d9488567e9b899576127e58635a2129f31511d00c776ac159e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gu-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e6e4f86dc0b65e3238f613c68432ba9b4768224bf834c471fb064213cdcffd9c"; + sha256 = "29661684a641a49ad8eca9a2966cd8164ed81a13c17f8308f629730216a1a067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/he/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e45ddc3357d75000afbf65b850531e23ad5563234e457007cfd1992fa4efc114"; + sha256 = "213c1c59fe3d12769e6cc059aae34e00f6427538e0995bba8bfae888ee18c967"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hi-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2b37c00298ce599143e2639dbc245b5f558349438d7e1f282dfc299720842588"; + sha256 = "bab8dd86b381dcedfa0d2cf63415c978b89f2575fb2714de8b99057f4b74b9d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "456d75b5ce6fd21c0d5177904d82d960a7258039184bf7ba8e0c71a783d4b601"; + sha256 = "ae3cd7d66386008e46c23d407e3bb4139161afb4bf7e502f75a13cb04a351ccd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hsb/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c9e835676d1eab60932b2dac810c25fddb61aca134eeb1fb842fb7f3e1ebcf25"; + sha256 = "6e5dd5938957ee83fbd44a2b2ef611a5fa721f310ae2ccee51ec2d58dff3c34d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hu/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4706f3eaf40cf7eb4ecc6f6efcd64cd76cb1228bedd9286b4cc9235ebcec7ec6"; + sha256 = "6e3eda91a7fdecbcd7b0f3e26a08e76363c874349995c4d345fbcdb2ef1137a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hy-AM/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "bec66380c9ed8d132d84cd68c01989fcbd48afb881d8616017c603dcb7e176fd"; + sha256 = "85ef0cda129576fc12ff3a8ca33fc7ff2094d17ca61598d867118c95149d7b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ia/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "dac076b82ed64857f048383c427776354c75bbe14a8f2ba4aa62978546cd6901"; + sha256 = "1a20c3717c92654cbcd7991f4406c731ccfaac0e65abfbe57fa45e71b5de32b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/id/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c41633c777da109384ab97049b0058fc5783359ac414674eb929fd19bf2d625c"; + sha256 = "fc12f3ebed4f5d94cd5477aea7c55d163ea3dbbadfb32882c2ac16e3e756b2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/is/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1c86162d0ed17742cb3c51c39cc6526ca4bac5f9dae9b3091d8fb4b9f62450fc"; + sha256 = "3cbd23cdf2489e0675df0c01a35e989157a4643469c9807000a7ae8119f41d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/it/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "88619c601a1e5cd2a63adb00f3f1383b7dfb59bbad526209fdf563c1a7c74fe1"; + sha256 = "9944036094f2fcfc6b48dee59c002df040e9d2a0dfe34287863ffc1e7cfee2c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ja/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3dab393bc047ec868e18ef3088787ff3fad07979ff629b5b673f0ffad4e84bf0"; + sha256 = "37b65e4303424552276b17f132fba8856cab8c45a523946417a07585398266c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ka/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1f646449054056c528aa04722c0945b008c72471b2b6a7000afdb54e9e14a51d"; + sha256 = "4c2124df9437ba640a31aee0aa24a7ce4e4e65b612784dfc38143ac017e391de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kab/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ee51ba2291b12549cab7fde5007205927465ee592ecd15158b5cd0c5c071391"; + sha256 = "b6359d6ec95b88a9dfac977bce81dbc1ff2dcdb843ba668dd370169f73897d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "bc761d52486af47d637f2a982de38481db245f98d48fbd0c3710f7282e5eb0cc"; + sha256 = "258253a0de7ec38faf51bc89d941b96e4cf0cfb7d68a57b02e0da95032868fe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/km/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ff584ebbf260a5907d47533d03a844b11852e2a66e1873cbb9f97488dcf26805"; + sha256 = "3ab3aaf86d3d6dda5b8ac5e9752a34505eb9952695c1725ba95f6653da9d0563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kn/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "205c2a232c468cd00096f9b3e0e37ee6cd6cab2a89c64fc5e7090892129a2ce1"; + sha256 = "d0f13f2b126600635f2a5302bd4578db4d85cbfac4ff3d9321b2501d78525501"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ko/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b8d262276c6f67bde4bda7dde9f44fc9d663408df85b3be836da03b9c923a551"; + sha256 = "d7954ae5ea973112f82a59b3d0f6c35a1438b015eaecbd1a42c74c9728449dfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lij/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "fc8c42a338cf8074d77acaa967e5c470b813da87c9790eafe7aa36bda676cba8"; + sha256 = "0d0dbdc0ddbfcd2ca27d14926c43418b0f6e6b2b5ecfbdeadcab583188fb9626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lt/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2eaedf0027937f9f3de113d0f9a819a09d001c24458a4006c7d78f5581e151ce"; + sha256 = "a7e90f262b1b5a4e73fcdc72d773d35d364f440ade826f6dff54f96a6fa0e5b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lv/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "c2bfe7e376deac1df14f29a6c06c6ad80249f3b1d1e08855299ef96f3f8d9790"; + sha256 = "31208554497ba51184aff83c3b269418673199641fcaec355e11c6f39ac77355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "fc681082b2c0d73e2fe8c8aebe648dca6c172c31bf0319d7fcd26af6cbb67467"; + sha256 = "2f7ea63676a91811e56c8da29ce0db293b3d79a2cbe1cb1900f485cc952f78d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "03703982fd431a087d1b2a4584862f9c45784d1809ea21121f495afea2b9951f"; + sha256 = "d4c5b8e644e0d01806c33bef3f56bac5c7d9d7ca10fc89cdb7532d63cf09fb1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ms/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fb41c14f3f8f6050a874475a4619834e91a93e18694117d97164cf8d65929f2a"; + sha256 = "e586b747712997f37e1084b1ab552455a7b7d8a5e236986ce497f076111864b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/my/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d28d4ab28a45abf6e430ec2ed014e73606dbe4ea54318995565efe0722725188"; + sha256 = "4492749d9845e7d64257958b3f7be90e21bfaafdf47de0bde3026ee1c1a4397b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nb-NO/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d7cda4dca1b8ed107174b1ec8486f04741161c5e95eac55f291a0d6376c83bc7"; + sha256 = "512de585211758713b9017d999f1bd389c7e8f64791cbbbb8b77b0dec708cc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ne-NP/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5562fee4fea2956a346bcb23c2c2340cd16a816ef3f8a874d259e1f6a6f70ff6"; + sha256 = "b1bbd534b48fcf82c68db58ac4d631206f9628b4885313eb2e41304f61133521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2c9feee4d1c3079232768c9c8ca2e841e7c26685ad4b9dd609d3eabe478d8154"; + sha256 = "890f5d8c186d70b7a74c706a22db62752d698eca7f8bb493b464a21878059685"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nn-NO/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9d48f0a887015ffd0c75db18e0e2e79aaad177cc114797758cec33f33f08861c"; + sha256 = "4789bbc6d1f9d34e9f77f6f467012543b641c6551e3b905b67674888eb73f258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/oc/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "59cea9cc6edd8d6e92741bf8201cd135d3218ba1020579f6a6325e2e1697fd92"; + sha256 = "7a89251628584edded3b81577bac9de3784000bb2378fa9f33c86a5217472381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pa-IN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bfe9329826c927d22e3fab539e2564c72958c91330dfb036bcaa6784e2882864"; + sha256 = "5c45e48fef737bd3d440bbd9473f663e86bc48fdf7e8f9e20f7b957e0effc03c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "da8f8f87f49efcd6512b28a5dcefd0e7910e704ebb79b7c88810933e135239b1"; + sha256 = "18328281d621f732e523e6b6b1c031c8f5cdcf2e5014410609a36a4ea2e816ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-BR/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "221ba38616c0a5e10d91a39e58f194aef13b5bc3afdd07e3261dc3dae168b77c"; + sha256 = "5c2b4415d07437df8c56bb21f745b07e9881bd735bf03eebf9f3d59b69451e41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-PT/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0fa1e27f38f32d2ce835924b9b6e2987ea506bc440c7ed5268c5010b34882d99"; + sha256 = "97c06bcc8d88e455a050944ee4da28e43c1462679819cfec8c6301e89b92d420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/rm/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "83f4a241f541b08f1340cf474128546a4a0f3962c419f227f060b30e8ec70315"; + sha256 = "986dabad36bc830580605acf550c5d80671307a55507edf570105d6a98a9b73b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ro/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8922ab444d2f439dc96c1cff06142171922dec180ba81aa3d286afb53c635953"; + sha256 = "e904d820874191c2f4bbcacdaba2db0265e56a7dc94c719956e916d6af109727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ru/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "22be977b6c5e9f0ca73292fd36183412b2a98bbe44f7e5edeb9be5bf85951631"; + sha256 = "5a33442f83896abe9bfe09294fb4d649a50dd63f8504875ad1687efe2e45fa90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sco/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "91274de4fa273cc4ec05ae8b40be5367ed280d8e64b1cd68db604ec13360ad2a"; + sha256 = "ac0c1b81bc2f9943b18acc858a7d9130fa85894c3f4501c49261896da172bbaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/si/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "489d874123773bf5f3e94746e4c7242d73742dafded32a07c20bb91c7e544328"; + sha256 = "ffbb6c83e6c954a210326346b5149fd9ea119e61039c6ba723c1875e57126e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "66f1e39014a6c246572daa6f0c6a3230862e7274b5a32213c7397643caec8130"; + sha256 = "e4ce32c3d815a986c3e9f2c6884bc921939cd1aeacc618e4c2fb8a6d056b99fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ad7bdce055f140497dc79bc67107d5e6f99dd292f09446304dd49d0dbb039d03"; + sha256 = "3c368ef7fe1098ab0b92061018bc126a0ca729efcf8036ddcdf9f4f8f2ef9107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/son/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "db3da11990c0f401a72122c162cbe371c65d9b07a42e781251f082dc2b99b0d0"; + sha256 = "155991f47cf0cfee2845450c39d2904ab457e57f764dc72af1f7d719d8ab7321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sq/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "55b73a202acbb180073e8cb583100391e63d4d41516f1f241547dd72c9d64ca4"; + sha256 = "34695ecb1e007a3b35c147b2b69d804a2475f9a57ee897dc5707a17990113b81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d79e42379228bd7d8c67bfbb475e0865aede6e8cd3a5c630f961507c3ec9162a"; + sha256 = "a40a83bca5981c89bddc9e8643dd200578cd9369bc840fd043b63b59cb0b53d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sv-SE/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "83af8bc35f47c7f51872d6a50f1df6cc329418ebf4c756cf894afbe544ce2018"; + sha256 = "df03c928121add9d788b981b47a48a4dfe4c81ac24d5eb5d8b79d30fd6e588a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/szl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "09bc6aa2ec127f5ac9c04cf83b2e760b17439c8ffd3d2b904149b759e8a1c5f0"; + sha256 = "c26f1897068d86b3e43a74000830c23286a4242c33514aa76140e6da45a1eedb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ta/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f1aec8972ce8baf6e0b6c88bac92651a266bcb2e2bb5b57dbf91ef88c0999681"; + sha256 = "1cab202847e085f7b417e3a799fcfb1503d5bf58013c7ac775f919c4cfb65f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/te/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "23cca1765464d740d409e8fbad0909b969db9028581ca8c079be7df671e25216"; + sha256 = "e9bfefccb6684c96ec1e30eaf5975995cd41be87b90d36de1e8c03ccecd161d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/th/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "01826ca896e4e8ab9aae14c9b68532339a10c908d469e66be9dfb44f850c4ae9"; + sha256 = "88bfa631eccc7ddcb5de325fe581c0d6757e7e11022d525c1c7641064113c0de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tl/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "aa52050e375977f6dc3c09fd91afc5f2383015990cc5c2d2891fd354b2e214c5"; + sha256 = "18dc381b87a5a9bacbb81fe9ada9d9a73eaed5831b651dd55744ba8414f6fe8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tr/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "96362f9c7f919676e715ba7d4a20266e4e534c75bf5b4dec87ef49585a3e5e46"; + sha256 = "44945fc8f6991017765c5646f572fb7df9ec36b54eab6515e04b835b25ed81eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/trs/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "00ede759629983fc674a728a3f8c39b7b42bf132398b9077b623282809321f6c"; + sha256 = "20ba4a1b995d16e14f86f8c8a6c35c50b1634167872e3f2d742c0f950943da72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uk/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "054de96778b01b75459f1e391326dadbab5eabbc1ee2f0a464bb27b34ce15619"; + sha256 = "933bc001d37e9487a78e11d8eeaa778adc14848083759ce332a21928cf28e034"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ur/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "eb9d0ace110b7b5f0ba6ecf0e3d2acf90ccc0c5c8af88625f9ecf0aa4e010ffd"; + sha256 = "3ada62bc4d49378d5d987cfabfdb6c43ed7e7a1f507f2f99ada27a1585479486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uz/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d8a3429895051133ed8b93e7af9294340ca23b3570729fda4dc8127715898407"; + sha256 = "fcc2c6a1fccd58cf2a0e4492578f46fc98f57d187816e3c33c4575555b83923a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/vi/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a1180810cd4cbd14a2de895735505c8d7f98fb167bc874816eaf0817bbc98388"; + sha256 = "38fd1714da803f7e771937381e0b91ca0bac263a22f9ec5d5680425833493f7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/xh/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c9cc91a22984dab35e254e5b2d299df311be6a55cd4f27cd49e68f668bf673d9"; + sha256 = "db3ab9606ae8d4bdd8ad741d42676f6aecc5d299c89ff4386543dcaa67e98822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-CN/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ffdd75e46d51f3287aee918e06c5ea389ae9e5fa8b642abf66c5041f0d3b2c5f"; + sha256 = "c443537f9d38ccdcc4d9b6ebfea0517aa7950b730a7ad069208baea5f6793e2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-TW/firefox-109.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "fc8848b76084c6df1c4e4932ec8f4f0d14d2bb565bb87dc30b3b759fe90d0924"; + sha256 = "d71958a211006cf884e69f012ad7628919b23a706f747caaaa86ae6eec13f9ba"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index e5284c4097c9..f7fe34cb8d08 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -46,7 +46,7 @@ in writeScript "update-${pname}" '' grep "^[0-9]" | \ sort --version-sort | \ grep -v "funnelcake" | \ - grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ + grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (not isBeta) "grep -v \"b\" |"} \ tail -1` curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6340a0a14e0b..97087ef1da30 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "109.0.1"; + version = "110.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"; + sha512 = "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.7.0esr"; + version = "102.8.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b"; + sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 06bd49facb81..de68807d8f25 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -98,7 +98,7 @@ let usesNixExtensions = nixExtensions != null; - nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); requiresSigning = browser ? MOZ_REQUIRE_SIGNING -> toString browser.MOZ_REQUIRE_SIGNING != ""; @@ -114,7 +114,7 @@ let throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else a - ) (if usesNixExtensions then nixExtensions else []); + ) (lib.optionals usesNixExtensions nixExtensions); enterprisePolicies = { diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 01cd54cf8ee2..208bff18e1f2 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -70,7 +70,7 @@ let ++ lib.optional libvaSupport libva ++ [ gtk3 ]; - suffix = if channel != "stable" then "-" + channel else ""; + suffix = lib.optionalString (channel != "stable") "-${channel}"; crashpadHandlerBinary = if lib.versionAtLeast version "94" then "chrome_crashpad_handler" diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1bba399997f4..0683b5210cbc 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,28 +10,25 @@ , nixosTests }: -let serenity = fetchFromGitHub { - owner = "SerenityOS"; - repo = "serenity"; - rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; - hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; -}; -in stdenv.mkDerivation { pname = "ladybird"; - version = "unstable-2022-09-29"; + version = "unstable-2023-01-17"; - # Remember to update `serenity` too! src = fetchFromGitHub { owner = "SerenityOS"; - repo = "ladybird"; - rev = "d69ad7332477de33bfd1963026e057d55c6f222d"; - hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; + repo = "serenity"; + rev = "45e85d20b64862df119f643f24e2d500c76c58f3"; + hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; + sourceRoot = "source/Ladybird"; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + # https://github.com/SerenityOS/serenity/issues/17062 + substituteInPlace main.cpp \ + --replace "./SQLServer/SQLServer" "$out/bin/SQLServer" ''; nativeBuildInputs = [ @@ -47,17 +44,18 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DSERENITY_SOURCE_DIR=${serenity}" # Disable network operations "-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false" "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" ]; - # error: use of undeclared identifier 'aligned_alloc' - NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + NIX_CFLAGS_COMPILE = [ + "-Wno-error" + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + # error: use of undeclared identifier 'aligned_alloc' "-include mm_malloc.h" "-Daligned_alloc=_mm_malloc" - ]); + ]; # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 0a0eb47b0a19..b91e5b05b625 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/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/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index fe510c7fb9d4..009569f9c5c3 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "109.0-1", + "packageVersion": "110.0-1", "source": { - "rev": "109.0-1", - "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" + "rev": "110.0-1", + "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p" }, "firefox": { - "version": "109.0", - "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" + "version": "110.0", + "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9" } } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 2de8192150ec..e4730e1869f8 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "94.0.4606.54"; + version = "95.0.4635.37"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk="; + hash = "sha256-NQv9EVaBPfHygr76neYGACuk8A6Oc1GXAgizMa+jngw="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 5441c7a58cbd..5a0e81f4a4b8 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/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/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index d9ce8e30269c..28704db5c9e5 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/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/pkgs/applications/networking/browsers/vieb/pin.json b/pkgs/applications/networking/browsers/vieb/pin.json new file mode 100644 index 000000000000..5efefe840559 --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/pin.json @@ -0,0 +1,4 @@ +{ + "version": "9.5.1", + "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw=" +} diff --git a/pkgs/applications/networking/browsers/vieb/update.sh b/pkgs/applications/networking/browsers/vieb/update.sh new file mode 100755 index 000000000000..3efc25235891 --- /dev/null +++ b/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/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 135587f6b47e..d238d1428baf 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/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/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 413a387f14cc..eaf66d689df8 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/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/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 0afe9466b4cb..4dab874fd848 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; + hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo="; }; - vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; + vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index e2cc376af297..518a44232960 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.12.1"; + version = "2023.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-FXN/UUlzG3+AYYZeKJ6XUG4rD3cPWIx22h3zZpvZhiM="; + hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc="; }; vendorSha256 = null; @@ -56,6 +56,11 @@ buildGoModule rec { # Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused substituteInPlace "supervisor/supervisor_test.go" \ --replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol" + + # Workaround for: manager_test.go:197: + # Should be false + substituteInPlace "datagramsession/manager_test.go" \ + --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; doCheck = !stdenv.isDarwin; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6d13063bd056..fb9b6a1d11ac 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; + hash = "sha256-qNSnO+wtAKyUJwjIMZaiBUfgaoDFVttp04kTxr4H6po="; }; - vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; + vendorHash = "sha256-75l4YCYC38uX63Uv/MA7HciQ+wumWhTuimL+ctizBCs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index b028512dd7c9..719c0f634fb7 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.9"; + version = "2.6.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI="; + sha256 = "sha256-O3JJ75qfs02qxzyW4TwPfYckhxuULRK7n67QVZRyB3I="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-c4KvsHN+2QXk/+MJgRIm5L6LtRe5juUF8rw84aVot38="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 65d12431e988..5b0c5c57cdea 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.60"; + version = "0.8.62"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-kyWUokQl5n7ko/1pdNs15WxRAAfe8KioYpkTMcLhJjU="; + sha256 = "sha256-lnMinIZ1n94ks7H5tlYmgaDDHyGi5YxTM9dTrckQ9y0="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 2fbbc9ad1d24..a1335641e34e 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/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/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index d05b34cd7de9..381cd1d456b5 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/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/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 9ef43bed2eec..a35cfab16cd7 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/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/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5c47c602c33f..6c71c903bf37 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.4"; + version = "1.13.6"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; + hash = "sha256-CBWKKW5VIkRgl7wY63OCm/CowWHO389se3kEraqaDCI="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 60f6c3ddb5ea..12868dcc5afc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: 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="; @@ -20,12 +20,13 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" ]; + __darwinAllowLocalNetworking = true; + preCheck = '' # skipping version tests because they require dot git directory substituteInPlace cmd/helm/version_test.go \ --replace "TestVersion" "SkipVersion" - '' + lib.optionalString stdenv.isLinux '' - # skipping plugin tests on linux + # skipping plugin tests substituteInPlace cmd/helm/plugin_test.go \ --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ --replace "TestLoadPlugins" "SkipLoadPlugins" @@ -41,6 +42,12 @@ buildGoModule rec { installShellCompletion helm.{bash,zsh,fish} ''; + passthru.tests.version = testers.testVersion { + package = kubernetes-helm; + command = "helm version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 64fa0f35e543..c08e12a4de8e 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk="; + sha256 = "sha256-JeQP2KXoLxkyRZVFcd6Rrz5xyJd+F3plzznAVP3Um8g="; }; - vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg="; + vendorSha256 = "sha256-d5NSqCJrk9QhV5gVOKUG/uJxuvt8X8hiQd8yJEoXPL0="; + + ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 7d9135045f17..39a03eceacaa 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.8.3"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-FpF/d+e5T6nb0OENaYLY+3ATZ+qcAeih5/yKI+AtfKA="; + hash = "sha256-aqRgny1vU+dxpZpzwL4aSbYfTGrZbRffQy81mMBvnJk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { # NOTE: helm-secrets is comprised of shell scripts. dontBuild = true; - # NOTE: Remove the install and upgrade hooks. + # NOTE: Fix version string postPatch = '' - sed -i '/^hooks:/,+2 d' plugin.yaml + sed -i 's/^version:.*/version: "${version}"/' plugin.yaml ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b04772334..fba5d36a4256 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.150.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw="; doCheck = false; @@ -23,8 +23,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index ec4c1b8a04b4..fcbab9313ecd 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/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/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3s/chart-versions.nix rename to pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix new file mode 100644 index 000000000000..72fbe89dd6b3 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -0,0 +1,326 @@ +{ 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.16+k3s1"; # k3s git tag + k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk="; + k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ="; + + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16 + # At the time of writing, there are two traefik charts, and that's it + charts = import ./chart-versions.nix; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L54 + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I="; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9 + containerdVersion = "1.5.16-k3s2-1-22"; + containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19 + 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 charts.traefik; + traefik-crdChart = fetchurl charts.traefik-crd; + + # 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.16%2Bk3s1/scripts/build#L123-L131 + 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/k3s-completion + 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; + + 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 + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts + + 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; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_24/0001-script-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/1_24/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 000000000000..115fd6824772 --- /dev/null +++ b/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/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix new file mode 100644 index 000000000000..11037db5b6d3 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -0,0 +1,328 @@ +{ 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; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 000000000000..115fd6824772 --- /dev/null +++ b/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/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix new file mode 100644 index 000000000000..b62eec692855 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -0,0 +1,328 @@ +{ 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; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix new file mode 100644 index 000000000000..8c40604d0f1c --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/1_26/default.nix similarity index 97% rename from pkgs/applications/networking/cluster/k3s/default.nix rename to pkgs/applications/networking/cluster/k3s/1_26/default.nix index 74f54d28d594..cef2355a3da6 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -75,7 +75,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 superherointj ]; + maintainers = with maintainers; [ euank mic92 superherointj yajo ]; platforms = platforms.linux; }; @@ -319,7 +319,14 @@ buildGoModule rec { passthru.updateScript = ./update.sh; - passthru.tests = nixosTests.k3s; + passthru.mkTests = version: + let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); + in { + single-node = nixosTests.k3s.single-node.${k3s_version}; + multi-node = nixosTests.k3s.multi-node.${k3s_version}; + }; + passthru.tests = passthru.mkTests k3sVersion; + meta = baseMeta; } diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/1_26/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/k3s/update.sh rename to pkgs/applications/networking/cluster/k3s/1_26/update.sh diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 141a17e34e2f..8ac275c1b928 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/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/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index aefcef2baccc..6a02127405d3 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.18.4"; + version = "2.19.0"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; + hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao="; }; - vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; + vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 7e7bba1d37b3..be8834d05f53 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; + sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo="; }; vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 45f0ee66f61e..9726edcf5f09 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; + sha256 = "sha256-FDcNrtdAMiSvY84I4zdVEEfOf48n7vE26yQf3IZ69xg="; }; - vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; + vendorHash = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix new file mode 100644 index 000000000000..c7abd03ccd7e --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubeshark, nix-update-script }: + +buildGoModule rec { + pname = "kubeshark"; + version = "38.5"; + + src = fetchFromGitHub { + owner = "kubeshark"; + repo = "kubeshark"; + rev = version; + sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk="; + }; + + vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc="; + + ldflags = let t = "github.com/kubeshark/kubeshark"; in [ + "-s" "-w" + "-X ${t}/misc.GitCommitHash=${src.rev}" + "-X ${t}/misc.Branch=master" + "-X ${t}/misc.BuildTimestamp=0" + "-X ${t}/misc.Platform=unknown" + "-X ${t}/misc.Ver=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + checkPhase = '' + go test ./... + ''; + doCheck = true; + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd kubeshark \ + --bash <($out/bin/kubeshark completion bash) \ + --fish <($out/bin/kubeshark completion fish) \ + --zsh <($out/bin/kubeshark completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = kubeshark; + command = "kubeshark version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}"; + description = "The API Traffic Viewer for Kubernetes"; + homepage = "https://kubeshark.co/"; + license = licenses.asl20; + longDescription = '' + The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, + Think TCPDump and Wireshark re-invented for Kubernetes + capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters. + ''; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 53da8b9be29f..7af197a9992d 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/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/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 896c2ac5a016..7ac3f68b35ee 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.12.3"; - sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; - vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; + version = "2.12.4"; + sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd"; + vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 365016eb672d..a124d633b37d 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.1.2"; - sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq"; - vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA="; + version = "23.2.1"; + sha256 = "0qjl6qxfg6bj22fwm2y01if5dqp2w79y45ibrg46r33pf6gbwjxj"; + vendorSha256 = "sha256-YxWBjbE3aBFfCbQeSTfQv5QzP5n4IRHHqNrFwrJPQ7g="; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index faec09480774..ba7f86e9e7d6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,6 @@ { lib , buildGoModule -, buildGo119Module +, buildGo120Module , fetchFromGitHub , nixosTests }: @@ -47,24 +47,24 @@ rec { nomad = nomad_1_4; nomad_1_2 = generic { - buildGoModule = buildGo119Module; - version = "1.2.15"; - sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; - vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + buildGoModule = buildGo120Module; + version = "1.2.16"; + sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ="; + vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8="; }; nomad_1_3 = generic { - buildGoModule = buildGo119Module; - version = "1.3.8"; - sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; - vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + buildGoModule = buildGo120Module; + version = "1.3.9"; + sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w="; + vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY="; }; nomad_1_4 = generic { - buildGoModule = buildGo119Module; - version = "1.4.3"; - sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; - vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + buildGoModule = buildGo120Module; + version = "1.4.4"; + sha256 = "sha256-mAimuWolTJ3lMY/ArnLZFu+GZv9ADdGsriXsTcEgdYc="; + vendorSha256 = "sha256-QtP7pzsIBd2S79AUcbOeVG71Mb5qK706rq5DkT41VqM="; passthru.tests.nomad = nixosTests.nomad; }; } diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index ce363080f459..9d246947038d 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/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/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index c9af58b1a8a8..fc2aa83aa430 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.12.0"; + version = "5.13.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; + sha256 = "sha256-6kbfsqhALf7LFl0GS4VAMTVDFKP+CaEr6IPfpTZ33Fo="; }; - vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; + vendorHash = "sha256-lXW1yHrGLwZdhfkMLeu7zm0w2HxXk1DW+QEY+rfGZpE="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix new file mode 100644 index 000000000000..0ebb08337ccf --- /dev/null +++ b/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/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 877dddfa1e2b..5ef93e307cfb 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "3.73.1"; + version = "3.73.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; + sha256 = "sha256-5MMSQy7SUFZhUycv1Kfkz46aY2tMldNZOH63wlQjq6o="; }; vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 7459bba1697b..ee045f5782a9 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/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/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 0d0d0ab08498..bad060ba41a1 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg="; + hash = "sha256-bgwSkI5XxtPhm4XrDPUhOErHawkLf34tFsw5SkQrm74="; }; - vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0="; + vendorHash = "sha256-hkfzn9wOc7W0CIs72Cn3qZ5iFrDAffSFa4BnRt6fsF8="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 0b1077443a49..6a2c39de113c 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/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/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c4e95f811896..8a28228a3c02 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -46,11 +46,11 @@ "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 }, @@ -110,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=", + "hash": "sha256-WBb1cio+vxt7QM3bM1T2OEusHXpQs/bjUFxRGCFTbIE=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.53.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q=" + "vendorHash": "sha256-WndEg+n0hId7R35OeHamP+OxzzRee7f+qXIhWmos8WI=" }, "azuread": { - "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", + "hash": "sha256-CTiYxmH39Jjh7wGKWmH0EoQa1H1bkV9hBNeHR+WVvF0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.33.0", + "rev": "v2.34.1", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=", + "hash": "sha256-FPgq/BsciisMhdSYsYiHnMQJFaTAa/llQ1RVS/sOzhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.42.0", + "rev": "v3.44.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -173,11 +173,11 @@ "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, "brightbox": { - "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", + "hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, @@ -283,13 +283,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", + "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.20.0", + "rev": "v3.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" + "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -319,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=", @@ -355,21 +355,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.1", + "rev": "v1.12.0", "spdx": "MIT", - "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" + "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", + "hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.44.0", + "rev": "v0.45.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -412,20 +411,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-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=", + "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.17.0", + "rev": "v5.18.0", "spdx": "MIT", "vendorHash": null }, @@ -439,22 +438,22 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=", + "hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.51.0", + "rev": "v4.53.1", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=", + "hash": "sha256-eXIYVB3YzhJNjYNR1oB7bj5uGZgRhgMD5eWxLls6KoE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.51.0", + "rev": "v4.53.1", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, @@ -468,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", + "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" + "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", @@ -495,11 +494,11 @@ "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { - "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", + "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -541,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", + "hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.1", + "rev": "v1.44.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -640,20 +639,20 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", + "hash": "sha256-UqMPeyMTXTnVknFqhCSm/wG8IYLW63n/wSvc5/ofjW0=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", "vendorHash": null }, "launchdarkly": { - "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "hash": "sha256-41lGYGf2t9q5tLHZbL2IksmYAy4Dw3nBZuiSOuG9/r8=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.4", + "rev": "v2.9.5", "spdx": "MPL-2.0", "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, @@ -766,13 +765,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=", @@ -812,20 +811,20 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", + "hash": "sha256-PjtsFrUwLsSLXog/n6JkFLFPZm7FPa/n8N5IJ0vkuuE=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.105.0", + "rev": "v4.108.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", + "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.41.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, @@ -857,13 +856,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", + "hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.3", + "rev": "v1.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" + "vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU=" }, "opsgenie": { "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", @@ -875,20 +874,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", + "hash": "sha256-xims3nYFVSS38FIMJhUhtK7lKpnRzzlojYZY6t57owA=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.26.0", + "rev": "v0.27.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-utbV/EVSYIln0ruf4qis9rbKifx/DUct3tDOTUO22N0=", + "hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.9.3", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -983,13 +982,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=", @@ -1028,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-uO3LgEQjeHS8kbolFZ3jb6FltMAiWNTVsjCSrsI776M=", + "hash": "sha256-aFRjbr0Gzu2GtxJrIEl7ahEcnOQOprJQnetaIzPePAo=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.56.3", + "rev": "v0.56.4", "spdx": "MIT", - "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" + "vendorHash": "sha256-shzsn3N6pVFe6ecaoXpv6ZZ27MEUUV82gnRMHFEtYlU=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", @@ -1046,13 +1045,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=", + "hash": "sha256-u+wOQwLejlS8Bap8M92wu1jdc0NAemnJsUjNIacGX+A=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.97.0", + "rev": "v1.100.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc=" + "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1091,11 +1090,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-QJUxLwKG3XabACbAvLLKBG9+cmCYRQFpRTWRU6rKwfI=", + "hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.7", + "rev": "v1.79.10", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1173,12 +1172,12 @@ "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", + "hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, @@ -1219,20 +1218,20 @@ "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=", + "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4865ca4901cb..6a722b80b834 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -12,18 +12,18 @@ }: let - generic = { version, sha256, vendorSha256 ? null, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; + generic = { version, hash, vendorHash ? null, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "version" "hash" "vendorHash" ]; in buildGoModule ({ pname = "terraform"; - inherit version vendorSha256; + inherit version vendorHash; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; rev = "v${version}"; - inherit sha256; + inherit hash; }; ldflags = [ "-s" "-w" ]; @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.7"; - sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; - vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; + version = "1.3.9"; + hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4="; + vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 8719ebebb768..c8f2fb070fba 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/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/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 19aaa36c7eb6..ebb28798f55e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.13"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; + sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index bc4f1959eaac..dcb4dd9eb08d 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/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/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index ae56b05bd96d..c93480694a9f 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/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/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 7adcfc8a9a57..3e66621b5719 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.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/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index f1225f87eefb..57cf5e20bcd5 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/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/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 1cd83cda77a9..af2dbd1a9a4f 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,18 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: +{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }: stdenv.mkDerivation { pname = "rsstail"; version = "2.1"; src = fetchFromGitHub { - sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; - rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; - repo = "rsstail"; owner = "folkertvanheusden"; + repo = "rsstail"; + rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; + sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" @@ -21,7 +20,8 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - doCheck = true; + # just runs cppcheck linter + doCheck = false; meta = with lib; { description = "Monitor RSS feeds for new entries"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { RSSTail is more or less an RSS reader: it monitors an RSS feed and if it detects a new entry it'll emit only that new entry. ''; - homepage = "http://www.vanheusden.com/rsstail/"; + homepage = "https://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; maintainers = [ maintainers.Necior ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f14433b6c179..74d51ce43041 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.21"; + version = "3.5.25"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; + hash = "sha256-Xb33/wz85RjBpRkKD09hfDr6txoB1ksKphbjrVt0QWg="; }; postPatch = '' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 287e83ffa050..60c928e0b9cc 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.62.2"; + version = "3.63.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; + hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38="; }; configureFlags = [ diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 88319182a648..2285a11bbf02 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-zdOcQ/+WXS7pDfnvYdb/FDjMT3yJdwnS8DoH2MIDcDs="; + sha256 = "sha256-UhRsgUz9au7e47cS6yrIJXc/8ZxVDpMHWBjoAcw+oCM="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorHash = "sha256-kx94B1XIXWJOY9Y69lNb/sHWVjsuFuOXrdtJFJrUuAs="; + vendorHash = "sha256-EiBt2SxUQY05Wr7KJbK+fs3U3iSmqECJ0glS8B2Ox9Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 46394c107dec..f83a0757b26b 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "2.9.18"; + version = "2.9.20"; pname = "snort"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; + sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index a44f3f555dee..bf7626759b36 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.8"; + version = "6.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; + sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch b/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch new file mode 100644 index 000000000000..4784e6790fc3 --- /dev/null +++ b/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/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch b/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch new file mode 100644 index 000000000000..07b95960ef85 --- /dev/null +++ b/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/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix new file mode 100644 index 000000000000..cb10e43933aa --- /dev/null +++ b/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/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch b/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch new file mode 100644 index 000000000000..18aef601325d --- /dev/null +++ b/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/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index ddeb03698e95..0bacf8ce03c4 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/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/pkgs/applications/networking/ids/zeek/fix-installation.patch b/pkgs/applications/networking/ids/zeek/fix-installation.patch new file mode 100644 index 000000000000..6360a1173051 --- /dev/null +++ b/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/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 0c43ffbeea91..47d6db156279 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/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/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 3d9fc7627b60..f4eb47428b5b 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - 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="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; + hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.3"; + version = "1.34.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM="; + hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; }; - npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c="; + npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5a65b43a8acb..d9288c4a4464 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,37 +1,48 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking -, xorg, libXdmcp, libxkbcommon +, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking +, libadwaita , libnotify, libsoup, libgee -, librsvg, libsignal-protocol-c +, libsignal-protocol-c , libgcrypt -, libepoxy -, at-spi2-core , sqlite -, dbus , gpgme -, pcre +, pcre2 , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing - }: +, srtp +, libnice +, gnutls +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-vaapi +, webrtc-audio-processing +}: stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; + sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; }; + postPatch = '' + # don't overwrite manually set version information + substituteInPlace CMakeLists.txt \ + --replace "include(ComputeVersion)" "" + ''; + nativeBuildInputs = [ vala cmake - ninja + ninja # https://github.com/dino/dino/issues/230 pkg-config wrapGAppsHook gettext @@ -40,40 +51,42 @@ stdenv.mkDerivation rec { buildInputs = [ qrencode gobject-introspection - glib-networking glib + glib-networking # required for TLS support + libadwaita libgee - gnome.adwaita-icon-theme sqlite gdk-pixbuf - gtk3 + gtk4 libnotify gpgme libgcrypt libsoup - pcre - libepoxy - at-spi2-core - dbus + pcre2 icu libsignal-protocol-c - librsvg gspell srtp libnice gnutls gstreamer gst-plugins-base - gst-plugins-good + gst-plugins-good # contains rtpbin, required for VP9 + gst-plugins-bad # required for H264, MSDK + gst-vaapi # required for VAAPI webrtc-audio-processing - ] ++ lib.optionals (!stdenv.isDarwin) [ - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon ]; - cmakeFlags = ["-DBUILD_TESTS=yes"]; + cmakeFlags = [ + "-DBUILD_TESTS=true" + "-DRTP_ENABLE_H264=true" + "-DRTP_ENABLE_MSDK=true" + "-DRTP_ENABLE_VAAPI=true" + "-DRTP_ENABLE_VP9=true" + "-DVERSION_FOUND=true" + "-DVERSION_IS_RELEASE=true" + "-DVERSION_FULL=${version}" + ]; # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index fdfb992192b3..87eb241686c6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/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.146"; + canary = "0.0.148"; } 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-5GiG+RGqwHUdIeSVWpbaIw3sTuZbvIQeetXSEvSqTls="; + sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 362d7a096bfb..6e462ef24dbe 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/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/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/pkgs/applications/networking/instant-messengers/element/keytar/pin.json index fa2e95d4e1a0..dc7420ab4543 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json +++ b/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/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index d18cc7d0e8bf..0ddfa0247263 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/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/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock deleted file mode 100644 index 5a3abec6ded8..000000000000 --- a/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/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/pkgs/applications/networking/instant-messengers/element/seshat/pin.json index fdb5afe67a25..78d5156f54a4 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json +++ b/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/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix new file mode 100644 index 000000000000..a30bfa2dcb02 --- /dev/null +++ b/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/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix index f76d9ee9f12a..80efff68e65f 100644 --- a/pkgs/applications/networking/instant-messengers/jami/client.nix +++ b/pkgs/applications/networking/instant-messengers/jami/client.nix @@ -9,7 +9,7 @@ , python3 , qttools # for translations , wrapQtAppsHook -, ffmpeg-jami +, ffmpeg_5 , jami-daemon , libnotify , qt5compat @@ -43,7 +43,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - ffmpeg-jami + ffmpeg_5 jami-daemon libnotify networkmanager diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common deleted file mode 100644 index 0aac24e24bb6..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common +++ /dev/null @@ -1,156 +0,0 @@ ---disable-everything ---enable-zlib ---enable-gpl ---enable-swscale ---enable-bsfs ---disable-filters ---disable-programs ---disable-postproc ---disable-protocols ---enable-protocol=crypto ---enable-protocol=file ---enable-protocol=rtp ---enable-protocol=srtp ---enable-protocol=tcp ---enable-protocol=udp ---enable-protocol=unix ---enable-protocol=pipe ---disable-demuxers ---disable-muxers ---enable-muxer=rtp ---enable-muxer=g722 ---enable-muxer=g723_1 ---enable-muxer=g726 ---enable-muxer=g726le ---enable-muxer=h263 ---enable-muxer=h264 ---enable-muxer=hevc ---enable-muxer=matroska ---enable-muxer=webm ---enable-muxer=ogg ---enable-muxer=pcm_s16be ---enable-muxer=pcm_s16le ---enable-demuxer=rtp ---enable-demuxer=mjpeg ---enable-demuxer=mjpeg_2000 ---enable-demuxer=mpegvideo ---enable-demuxer=gif ---enable-demuxer=image_jpeg_pipe ---enable-demuxer=image_png_pipe ---enable-demuxer=image_webp_pipe ---enable-demuxer=matroska ---enable-demuxer=m4v ---enable-demuxer=mp3 ---enable-demuxer=ogg ---enable-demuxer=flac ---enable-demuxer=wav ---enable-demuxer=ac3 ---enable-demuxer=g722 ---enable-demuxer=g723_1 ---enable-demuxer=g726 ---enable-demuxer=g726le ---enable-demuxer=pcm_mulaw ---enable-demuxer=pcm_alaw ---enable-demuxer=pcm_s16be ---enable-demuxer=pcm_s16le ---enable-demuxer=h263 ---enable-demuxer=h264 ---enable-demuxer=hevc ---enable-parser=h263 ---enable-parser=h264 ---enable-parser=hevc ---enable-parser=mpeg4video ---enable-parser=vp8 ---enable-parser=vp9 ---enable-parser=opus ---enable-encoder=adpcm_g722 ---enable-decoder=adpcm_g722 ---enable-encoder=adpcm_g726 ---enable-decoder=adpcm_g726 ---enable-encoder=adpcm_g726le ---enable-decoder=adpcm_g726le ---enable-decoder=g729 ---enable-encoder=g723_1 ---enable-decoder=g723_1 ---enable-encoder=rawvideo ---enable-decoder=rawvideo ---enable-encoder=libx264 ---enable-decoder=h264 ---enable-encoder=pcm_alaw ---enable-decoder=pcm_alaw ---enable-encoder=pcm_mulaw ---enable-decoder=pcm_mulaw ---enable-encoder=mpeg4 ---enable-decoder=mpeg4 ---enable-encoder=libvpx_vp8 ---enable-decoder=vp8 ---enable-decoder=vp9 ---enable-encoder=h263 ---enable-encoder=h263p ---enable-decoder=h263 ---enable-encoder=mjpeg ---enable-decoder=mjpeg ---enable-decoder=mjpegb ---enable-libspeex ---enable-libopus ---enable-libvpx ---enable-libx264 ---enable-encoder=libspeex ---enable-decoder=libspeex ---enable-encoder=libopus ---enable-decoder=libopus ---enable-decoder=flac ---enable-decoder=vorbis ---enable-decoder=aac ---enable-decoder=ac3 ---enable-decoder=eac3 ---enable-decoder=mp3 ---enable-decoder=pcm_u24be ---enable-decoder=pcm_u24le ---enable-decoder=pcm_u32be ---enable-decoder=pcm_u32le ---enable-decoder=pcm_u8 ---enable-decoder=pcm_f16le ---enable-decoder=pcm_f24le ---enable-decoder=pcm_f32be ---enable-decoder=pcm_f32le ---enable-decoder=pcm_f64be ---enable-decoder=pcm_f64le ---enable-decoder=pcm_s16be ---enable-decoder=pcm_s16be_planar ---enable-decoder=pcm_s16le ---enable-decoder=pcm_s16le_planar ---enable-decoder=pcm_s24be ---enable-decoder=pcm_s24le ---enable-decoder=pcm_s24le_planar ---enable-decoder=pcm_s32be ---enable-decoder=pcm_s32le ---enable-decoder=pcm_s32le_planar ---enable-decoder=pcm_s64be ---enable-decoder=pcm_s64le ---enable-decoder=pcm_s8 ---enable-decoder=pcm_s8_planar ---enable-decoder=pcm_u16be ---enable-decoder=pcm_u16le ---enable-encoder=gif ---enable-decoder=gif ---enable-encoder=jpegls ---enable-decoder=jpegls ---enable-encoder=ljpeg ---enable-decoder=jpeg2000 ---enable-encoder=png ---enable-decoder=png ---enable-encoder=bmp ---enable-decoder=bmp ---enable-encoder=tiff ---enable-decoder=tiff ---enable-filter=scale ---enable-filter=overlay ---enable-filter=amix ---enable-filter=amerge ---enable-filter=aresample ---enable-filter=format ---enable-filter=aformat ---enable-filter=fps ---enable-filter=transpose ---enable-filter=pad diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux deleted file mode 100644 index 6c40e8d2ea99..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux +++ /dev/null @@ -1,18 +0,0 @@ ---enable-pic ---target-os=linux ---enable-indev=v4l2 ---enable-indev=xcbgrab ---enable-vdpau ---enable-hwaccel=h264_vdpau ---enable-hwaccel=mpeg4_vdpau ---enable-vaapi ---enable-hwaccel=h264_vaapi ---enable-hwaccel=mpeg4_vaapi ---enable-hwaccel=h263_vaapi ---enable-hwaccel=vp8_vaapi ---enable-hwaccel=mjpeg_vaapi ---enable-hwaccel=hevc_vaapi ---enable-encoder=h264_vaapi ---enable-encoder=vp8_vaapi ---enable-encoder=mjpeg_vaapi ---enable-encoder=hevc_vaapi diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 deleted file mode 100644 index 2043aa3ee2d3..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 +++ /dev/null @@ -1,10 +0,0 @@ ---enable-cuvid ---enable-ffnvcodec ---enable-nvdec ---enable-nvenc ---enable-hwaccel=h264_nvdec ---enable-hwaccel=hevc_nvdec ---enable-hwaccel=vp8_nvdec ---enable-hwaccel=mjpeg_nvdec ---enable-encoder=h264_nvenc ---enable-encoder=hevc_nvenc diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches deleted file mode 100644 index 28f884e66769..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches +++ /dev/null @@ -1,7 +0,0 @@ -remove-mjpeg-log.patch -change-RTCP-ratio.patch -rtp_ext_abs_send_time.patch -libopusdec-enable-FEC.patch -libopusenc-reload-packet-loss-at-encode.patch -ios-disable-b-frames.patch -screen-sharing-x11-fix.patch diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 715560c6e128..bf2392f63153 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -9,7 +9,7 @@ , asio , dbus , dbus_cplusplus -, ffmpeg-jami +, ffmpeg_5 , fmt , gmp , gnutls @@ -51,7 +51,7 @@ stdenv.mkDerivation { dbus dbus_cplusplus fmt - ffmpeg-jami + ffmpeg_5 gmp gnutls http-parser diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ea898c0da8c9..497616a6c038 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchzip , fetchpatch -, ffmpeg_5 , pjsip , opendht , jack @@ -41,31 +40,6 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in rec { - ffmpeg-jami = (ffmpeg_5.override rec { - version = "5.0.1"; - branch = version; - sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; - doCheck = false; - }).overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/ffmpeg/"; - in - { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)) ++ - # SDL2 recently changed their versioning - [ - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; - hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; - }) - ]; - configureFlags = old.configureFlags - ++ (readLinesToList ./config/ffmpeg_args_common) - ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) - ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); - outputs = [ "out" "doc" ]; - }); - pjsip-jami = pjsip.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/pjproject/"; @@ -105,10 +79,10 @@ rec { }; jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; + inherit version src udev jack jami-meta pjsip-jami opendht-jami; }; jami-client = qt6Packages.callPackage ./client.nix { - inherit version src ffmpeg-jami jami-meta; + inherit version src jami-meta; }; } diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 0ef6b2e74d7b..cb634f434d24 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 +{ stdenv, lib, fetchFromGitHub, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: @@ -6,11 +6,13 @@ let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; - version = "2.10.5550"; + version = "2.11.5633"; - src = fetchurl { - url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; - sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; + src = fetchFromGitHub { + owner = "jitsi"; + repo = "jitsi"; + rev = "refs/tags/${lib.versions.patch version}"; + hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M="; }; patches = [ ./jitsi.patch ]; @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://jitsi.org/"; + homepage = "https://desktop.jitsi.org/"; description = "Open Source Video Calls and Chat"; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index baa4613b1731..06a1d98762f8 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-03-20"; + version = "unstable-2023-01-31"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "8cce6d20b49e917929521a13caed30e81037c868"; - hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; + rev = "0c9370cfe41ae7f99b4fceced896f66fb4e9195c"; + hash = "sha256-6KSzsPs8tSzVOxGUWj/AvSJihrSwamZgUNGvjnmNnag="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2c34523f5513..d8f3fcb17939 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/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.4.1"; - hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; + version = "6.5.1"; + hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.5.0-beta.2"; - hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; + version = "6.6.0-beta.1"; + hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 904e47695d5b..3fe012fd0b59 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20230128-1"; + version = "20230211"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y="; + hash = "sha256-NeArgsl5xbgcXY8OKjF2wMdwJqgsBdR1XSrIWPqRWMs="; }; postPatch = '' @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch index 1d9ca8d838d9..4a49ff991e6b 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -1,4 +1,4 @@ -From 2c126682aaabd7f486dfb2ff75fe29b5d8697060 Mon Sep 17 00:00:00 2001 +From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Feb 2022 12:33:13 +0100 Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD @@ -8,10 +8,10 @@ Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 799e782..caceaac 100644 +index ea3fea1..01e444d 100644 --- a/build.gradle +++ b/build.gradle -@@ -83,6 +83,9 @@ static String getVersion() { +@@ -82,6 +82,9 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -21,16 +21,16 @@ index 799e782..caceaac 100644 mavenCentral() } -@@ -104,6 +107,8 @@ dependencies { +@@ -101,6 +104,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -171,4 +176,4 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -170,4 +175,4 @@ allprojects { runtime { options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] @@ -38,5 +38,5 @@ index 799e782..caceaac 100644 \ No newline at end of file +} -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch index 96a7d6d2ef3f..bf583de53ba2 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -1,4 +1,4 @@ -From b068af1f3e49dedfb489e3ed957934ff651e98ee Mon Sep 17 00:00:00 2001 +From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Feb 2022 12:36:15 +0100 Subject: [PATCH 2/2] buildconfig/local deps fixes @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] buildconfig/local deps fixes 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle -index 799e782..6ecef3e 100644 +index ea3fea1..24415d8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal @@ -35,7 +35,7 @@ index 799e782..6ecef3e 100644 compileJava.options.encoding = 'UTF-8' -@@ -83,7 +93,10 @@ static String getVersion() { +@@ -82,7 +92,10 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -47,16 +47,16 @@ index 799e782..6ecef3e 100644 } dependencies { -@@ -104,6 +117,8 @@ dependencies { +@@ -101,6 +114,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -167,8 +182,3 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -166,8 +181,3 @@ allprojects { } } } @@ -67,5 +67,5 @@ index 799e782..6ecef3e 100644 -} \ No newline at end of file -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a9e023cdf63a..b15dbbb92bdb 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -2,15 +2,18 @@ , makeWrapper, fetchpatch, substituteAll, jre_minimal }: +# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` +# can be removed again! + let pname = "signald"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RN0OYjOmVtHKeFkviep952uf3qWuBj8lhcaP1Lk/gDo="; + sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; jre' = jre_minimal.override { @@ -42,11 +45,30 @@ let export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh -x + + # WARNING: don't try this at home and wear safety-goggles while working with this! + # We patch around in the dependency tree to resolve some spurious dependency resolution errors. + # Whenever this package gets updated, please check if some of these hacks are obsolete! + + # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), + # but gradle doesn't detect such renames, only fetches the latter and then fails + # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. + pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null + cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar + popd &>/dev/null + + # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required + # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. + # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 + # the only relevant change is in the code itself (and in the tests/docs), so this seems + # binary-compatible. + cp -v \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar ''; # Don't move info to share/ forceShare = [ "dummy" ]; @@ -54,12 +76,12 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE="; - aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs="; + x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; + aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; }.${stdenv.system} or (throw "Unsupported platform"); }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit pname src version; patches = [ @@ -69,6 +91,11 @@ in stdenv.mkDerivation rec { }) ]; + passthru = { + # Mostly for debugging purposes. + inherit deps; + }; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 7bd88eaa7545..0f2ef4d586ff 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -177,7 +177,8 @@ let # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ + --replace /usr/share/ $out/share/ \ + --replace bin/slack "bin/slack -s" runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index bd2f9e4b3f5e..f627647e1efb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -56,6 +56,10 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + ./tg_owt.patch + ]; + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch new file mode 100644 index 000000000000..05332d51c047 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch @@ -0,0 +1,23 @@ +--- a/src/modules/include/module_common_types_public.h ++++ b/src/modules/include/module_common_types_public.h +@@ -11,6 +11,7 @@ + #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + ++#include + #include + + #include "absl/types/optional.h" +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..790b0b73 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -13,6 +13,8 @@ + + #include "absl/types/optional.h" + ++#include ++ + namespace rtc { + class BitBuffer; + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ffb5fbb895eb..dbcb872d161e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.6.0"; + version = "4.6.3"; # 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 = "1kwg286mbpf0gj57702fqddmyn5iihzny3da425psnwa10s217yf"; + sha256 = "1kv7aqj4d85iz6vbgvfplyfr9y3rw31xhdgwiskrdfv8mqb0mr5v"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index e80ccd2105aa..9feb5ff10a07 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, ninja, yasm , libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , openh264, usrsctp, libevent, libvpx @@ -31,6 +31,14 @@ stdenv.mkDerivation { mesa libepoxy libglvnd ]; + patches = [ + # GCC 12 Fix + (fetchpatch { + url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch"; + hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0="; + }) + ]; + cmakeFlags = [ # Building as a shared library isn't officially supported and may break at any time. "-DBUILD_SHARED_LIBS=OFF" diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index f28cc3c25f6e..1c2c3eb9fec7 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.10.0.24000"; + version = "42.12.0.24485"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z"; - sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221206141837/Webex_ubuntu.7z"; + sha256 = "4c09c13b760abbdcc8bc1a74d137f8bc23386da4425cbefd8ea75bd0a877fdbf"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d18761689ee3..cb132610d0c2 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.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/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 241828fdfc3c..f46283583cd1 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/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/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index e00a177b673e..d5a977f65fbe 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2023-01-03"; + version = "unstable-2023-02-13"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "5414edb01f30ad9480e211030db1bcd858e5f741"; - sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA="; + rev = "1318e784bd2bba3765aee97811a3f0053d3a6723"; + sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; @@ -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/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index e280b7390035..4806e3ae4a73 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.38"; + version = "3.1.0"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM="; + sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o="; }; - vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM="; + vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index ddc0f4b932ad..9ffdb1630107 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -12,17 +12,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM="; + hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg="; }; proxyVendor = true; - vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM="; + vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index d5e40edeb661..9dee3ed33d84 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -1,8 +1,8 @@ -diff --git a/config/aerc.conf b/config/aerc.conf -index fbbf587..ede1a03 100644 ---- a/config/aerc.conf -+++ b/config/aerc.conf -@@ -107,8 +107,7 @@ next-message-on-delete=true +diff --git i/config/aerc.conf w/config/aerc.conf +index 05ebbf4..db6877b 100644 +--- i/config/aerc.conf ++++ w/config/aerc.conf +@@ -152,8 +152,7 @@ # # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -10,9 +10,9 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/stylesets +# @out@/share/aerc/stylesets # - # default: "" - stylesets-dirs= -@@ -254,8 +253,7 @@ new-email= + #stylesets-dirs= + +@@ -445,8 +444,7 @@ message/rfc822=colorize # # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -20,37 +20,27 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/templates +# @out@/share/aerc/templates # - # default: "" - template-dirs= -diff --git a/config/config.go b/config/config.go -index 2120310..92b7655 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -331,8 +331,8 @@ func buildDefaultDirs() []string { + #template-dirs= + +diff --git i/config/config.go w/config/config.go +index 09fb5ef..c73a7ee 100644 +--- i/config/config.go ++++ w/config/config.go +@@ -60,8 +60,7 @@ func buildDefaultDirs() []string { } // Add fixed fallback locations - defaultDirs = append(defaultDirs, "/usr/local/share/aerc") - defaultDirs = append(defaultDirs, "/usr/share/aerc") -+ defaultDirs = append(defaultDirs, "@out@/local/share/aerc") + defaultDirs = append(defaultDirs, "@out@/share/aerc") return defaultDirs } -diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 885c4f8..77a853e 100644 ---- a/doc/aerc-config.5.scd -+++ b/doc/aerc-config.5.scd -@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus - "aerc", which defaults to ~/.config/aerc. - - Examples of these config files are typically included with your installation of --aerc and are usually installed in /usr/share/aerc. -+aerc and are usually installed in @out@/share/aerc. - - Each file uses the _ini_ format, and consists of sections with keys and values. - A line beginning with # is considered a comment and ignored, as are empty lines. -@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf. +diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd +index d48e38a..39784c4 100644 +--- i/doc/aerc-config.5.scd ++++ w/doc/aerc-config.5.scd +@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -59,26 +49,8 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/stylesets ``` - Default: "" -@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a - subject which contains "text". Use header,~regex to match against a regex. - - aerc ships with some default filters installed in the share directory (usually --_/usr/share/aerc/filters_). Note that these may have additional dependencies -+_@out@/share/aerc/filters_). Note that these may have additional dependencies - that aerc does not have alone. - - ## TRIGGERS -@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the - template name. - - aerc ships with some default templates installed in the share directory (usually --_/usr/share/aerc/templates_). -+_@out@/share/aerc/templates_). - - These options are configured in the *[templates]* section of aerc.conf. - -@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf. + *styleset-name* = __ +@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/templates ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -87,4 +59,26 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/templates ``` - Default: "" + *new-message* = __ +diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd +index 6c9e319..0ef97ce 100644 +--- i/doc/aerc-templates.7.scd ++++ w/doc/aerc-templates.7.scd +@@ -111,7 +111,7 @@ aerc provides the following additional functions: + Execute external command, provide the second argument to its stdin. + + ``` +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText}} + ``` + + *toLocal* +@@ -142,7 +142,7 @@ aerc provides the following additional functions: + Example: Automatic HTML parsing for text/html mime type messages + ``` + {{if eq .OriginalMIMEType "text/html"}} +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} + {{else}} + {{wrap 72 .OriginalText | quote}} + {{end}} diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 8033a734b981..49e8852fd0ce 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU="; + sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index a5ed92f519e3..65bb334611a6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM="; + sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 7837393926f6..0a4a4a9d7797 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/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/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index de82535cd560..fb852f76045d 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/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/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dfa92fc42c98..91a424d9eb12 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -18,6 +18,8 @@ , gssSupport ? true , writeScript }: +assert smimeSupport -> sslSupport; +assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 8fefcc1c3143..6c705d7cd362 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/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/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index a2972f9bfb96..6b5e8a254c89 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.106.4"; + version = "3.108.12"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; + sha256 = "sha256-ZXQCth5nhCkEZI348057cRjzFWl/IEytQmkmBuJzw3w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index dc8c5729ddf8..1bda56c54201 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/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/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 4592d17d348f..41ff2b74a064 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,16 +15,12 @@ nodePackages.n8n.override { pkgs.postgresql ]; - # Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052 - preRebuild = '' - patch -p1 -i ${./fix-permissions.diff} - '' + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. # This can supposedly be fixed by building a custom copy of the module from source, but that's way # too much complexity for a setup no one would ever actually run. # # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - lib.optionalString stdenv.isAarch64 '' + preRebuild = lib.optionalString stdenv.isAarch64 '' rm -rf node_modules/oracledb ''; diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/applications/networking/n8n/fix-permissions.diff deleted file mode 100644 index 81a5a4ee6465..000000000000 --- a/pkgs/applications/networking/n8n/fix-permissions.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- a/dist/LoadNodesAndCredentials.js -+++ b/dist/LoadNodesAndCredentials.js -@@ -216,6 +216,7 @@ - const { types } = loader; - this.types.nodes = this.types.nodes.concat(types.nodes); - this.types.credentials = this.types.credentials.concat(types.credentials); -+ let seen = new Set(); - const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => { - var _a; - if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:'))) -@@ -226,7 +227,16 @@ - type.iconUrl = iconUrl; - const source = path_1.default.join(dir, icon); - const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl); -- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination)); -+ if (!seen.has(destination)) { -+ seen.add(destination); -+ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => { -+ await (0, promises_1.copyFile)(source, destination); -+ await (0, promises_1.chmod)(destination, 0o644); -+ }); -+ } -+ else { -+ return Promise.resolve(); -+ } - })); - await Promise.all(iconPromises); - for (const nodeTypeName in loader.nodeTypes) { diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 01afe03fd448..0b08453a9625 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -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" = { @@ -310,13 +310,13 @@ let sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; }; }; - "@codemirror/language-6.4.0" = { + "@codemirror/language-6.5.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; - sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.5.0.tgz"; + sha512 = "dI+dV/u2klIt0Y9kE3TH9vuBidAB3xuuDPofwzvnW8ZKqJnKTbT3EjyV7DeKcmrRgXMhlPTL7AdH1V5KOCYuHQ=="; }; }; "@codemirror/lint-6.1.0" = { @@ -337,13 +337,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.7.3" = { + "@codemirror/view-6.8.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.7.3"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; - sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.8.1.tgz"; + sha512 = "bXWs42i1mnBexaktPABaEpYbt4FbJMnlesObDLF0GE8poRiNaRgm7H/2NfXfD5Swas1ULdFgONLLs4ncwHuz8g=="; }; }; "@colors/colors-1.5.0" = { @@ -418,13 +418,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.1" = { + "@fortawesome/fontawesome-common-types-6.3.0" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; - sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz"; + sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -436,13 +436,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.2.1" = { + "@fortawesome/free-regular-svg-icons-6.3.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz"; - sha512 = "wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz"; + sha512 = "cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -715,13 +715,13 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; - "@lezer/html-1.3.0" = { + "@lezer/html-1.3.1" = { name = "_at_lezer_slash_html"; packageName = "@lezer/html"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.0.tgz"; - sha512 = "jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg=="; + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz"; + sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw=="; }; }; "@lezer/javascript-1.4.1" = { @@ -1030,49 +1030,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.36.0" = { + "@sentry/core-7.37.1" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.36.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.36.0.tgz"; - sha512 = "lq1MlcMhvm7QIwUOknFeufkg4M6QREY3s61y6pm1o+o3vSqB7Hz0D19xlyEpP62qMn8OyuttVKOVK1UfGc2EyQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz"; + sha512 = "eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ=="; }; }; - "@sentry/integrations-7.36.0" = { + "@sentry/integrations-7.37.1" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.36.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.36.0.tgz"; - sha512 = "wrRoUqdeGi64NNimGVk8U8DBiXamxTYPBux0/faFDyau8EJyQFcv8zOyB78Za4W2Ss3ZXNaE/WtFF8UxalHzBQ=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.37.1.tgz"; + sha512 = "/7VZXw7/DxZPsGNEaU/gcKRNPtmK75mz9oM71C5UbRDDEdFSEeVq2jG+tOq2lIsd2VQlsAmN3DG5yqiGA9C4eQ=="; }; }; - "@sentry/node-7.36.0" = { + "@sentry/node-7.37.1" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.36.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.36.0.tgz"; - sha512 = "nAHAY+Rbn5OlTpNX/i6wYrmw3hT/BtwPZ/vNU52cKgw7CpeE1UrCeFjnPn18rQPB7lIh7x0vNvoaPrfemRzpSQ=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz"; + sha512 = "nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA=="; }; }; - "@sentry/types-7.36.0" = { + "@sentry/types-7.37.1" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.36.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.36.0.tgz"; - sha512 = "uvfwUn3okAWSZ948D/xqBrkc3Sn6TeHUgi3+p/dTTNGAXXskzavgfgQ4rSW7f3YD4LL+boZojpoIARVLodMGuA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz"; + sha512 = "c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="; }; }; - "@sentry/utils-7.36.0" = { + "@sentry/utils-7.37.1" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.36.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.36.0.tgz"; - sha512 = "mgDi5X5Bm0sydCzXpnyKD/sD98yc2qnKXyRdNX4HRRwruhC/P53LT0hGhZXsyqsB/l8OAMl0zWXJLg0xONQsEw=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz"; + sha512 = "/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA=="; }; }; "@servie/events-1.0.0" = { @@ -1093,22 +1093,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.32" = { + "@swc/core-1.3.35" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.32"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.32.tgz"; - sha512 = "Yx/n1j+uUkcqlJAW8IRg8Qymgkdow6NHJZPFShiR0YiaYq2sXY+JHmvh16O6GkL91Y+gTlDUS7uVgDz50czJUQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz"; + sha512 = "KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w=="; }; }; - "@swc/wasm-1.3.32" = { + "@swc/wasm-1.3.35" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.32"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.32.tgz"; - sha512 = "u27gmXtbe/y4M5fo38NCBKUFeFIWRCmppABxPvM9TsZ8KhO4EdZOI1L9sPHSZvVyAXRpnwC8cjYej/zOAZjAQA=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.35.tgz"; + sha512 = "8xBOgl9eziAuqF4HYwYx4Kh6eHfOQECvO0ZMlrFNW0jgE+ntqxcRjBhuzZ6iWb24nifzXbuGLQntbns4IJYJgQ=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1246,22 +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=="; - }; - }; - "@types/express-jwt-0.0.42" = { - name = "_at_types_slash_express-jwt"; - packageName = "@types/express-jwt"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"; - sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-serve-static-core-4.17.33" = { @@ -1273,15 +1264,6 @@ let sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; - "@types/express-unless-2.0.1" = { - name = "_at_types_slash_express-unless"; - packageName = "@types/express-unless"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-2.0.1.tgz"; - sha512 = "PJLiNw03EjkWDkQbhNjIXXDLObC3eMQhFASDV+WakFbT8eL7YdjlbV6MXd3Av5Lejq499d6pFuV1jyK+EHyG3Q=="; - }; - }; "@types/js-nacl-1.3.1" = { name = "_at_types_slash_js-nacl"; packageName = "@types/js-nacl"; @@ -1300,6 +1282,15 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; + "@types/jsonwebtoken-9.0.1" = { + name = "_at_types_slash_jsonwebtoken"; + packageName = "@types/jsonwebtoken"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; + sha512 = "c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw=="; + }; + }; "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -1336,13 +1327,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.11.18" = { + "@types/node-18.13.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.18"; + version = "18.13.0"; 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.13.0.tgz"; + sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1417,6 +1408,15 @@ let sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; }; }; + "@types/triple-beam-1.3.2" = { + name = "_at_types_slash_triple-beam"; + packageName = "@types/triple-beam"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"; + sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + }; + }; "@types/tunnel-0.0.3" = { name = "_at_types_slash_tunnel"; packageName = "@types/tunnel"; @@ -1435,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" = { @@ -1966,13 +1966,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1308.0" = { + "aws-sdk-2.1313.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1308.0"; + version = "2.1313.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1308.0.tgz"; - sha512 = "tm4UXah8dCqt1geyxrtoyp6dN5QhuLjNeACUZEsffww5oZPMx24EX9dAtvtSu3UfIHwmbR74QomYi1c1u8Jndg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz"; + sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ=="; }; }; "aws-sign2-0.7.0" = { @@ -2092,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" = { @@ -2380,13 +2380,13 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; - "bull-4.10.3" = { + "bull-4.10.4" = { name = "bull"; packageName = "bull"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-4.10.3.tgz"; - sha512 = "pp403srpkn9tYi7Z3Mu0sozehZ7rEEFGNJnN+nLxQwml6MySzefC9bPeCYedZoCkXdZ6VbIB8uNkMZg+hN/dAg=="; + url = "https://registry.npmjs.org/bull/-/bull-4.10.4.tgz"; + sha512 = "o9m/7HjS/Or3vqRd59evBlWCXd9Lp+ALppKseoSKHaykK46SmRjAilX98PgmOz1yeVaurt8D5UtvEt4bUjM3eA=="; }; }; "busboy-1.6.0" = { @@ -3442,13 +3442,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.4" = { + "define-properties-1.2.0" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; "degenerator-3.0.2" = { @@ -4117,15 +4117,6 @@ let sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; }; }; - "express-unless-2.1.3" = { - name = "express-unless"; - packageName = "express-unless"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-unless/-/express-unless-2.1.3.tgz"; - sha512 = "wj4tLMyCVYuIIKHGt0FhCtIViBcwzWejX0EjNxveAa6dG+0XBCQhMbx+PnkLkFCxLC69qoFrxds4pIyL88inaQ=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -4684,6 +4675,15 @@ let sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; + "glob-8.1.0" = { + name = "glob"; + packageName = "glob"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; + }; + }; "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -5098,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" = { @@ -5224,13 +5224,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "internal-slot-1.0.4" = { + "internal-slot-1.0.5" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; }; "interpret-1.4.0" = { @@ -5251,13 +5251,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.3.0" = { + "ioredis-5.3.1" = { name = "ioredis"; packageName = "ioredis"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; - sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz"; + sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg=="; }; }; "ip-1.1.8" = { @@ -5755,6 +5755,15 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; + "jose-4.11.4" = { + name = "jose"; + packageName = "jose"; + version = "4.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jose/-/jose-4.11.4.tgz"; + sha512 = "94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ=="; + }; + }; "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; @@ -5764,13 +5773,13 @@ let sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; }; }; - "js-base64-3.7.4" = { + "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; - sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; + sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; "js-md4-0.3.2" = { @@ -5989,13 +5998,13 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; - "jwks-rsa-1.12.3" = { + "jwks-rsa-3.0.1" = { name = "jwks-rsa"; packageName = "jwks-rsa"; - version = "1.12.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.3.tgz"; - sha512 = "cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA=="; + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz"; + sha512 = "UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw=="; }; }; "jws-3.2.2" = { @@ -6466,13 +6475,13 @@ let sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; }; }; - "logform-2.4.2" = { + "logform-2.5.1" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; + sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; }; }; "long-4.0.0" = { @@ -6547,13 +6556,13 @@ let sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; }; }; - "lru-memoizer-2.1.4" = { + "lru-memoizer-2.2.0" = { name = "lru-memoizer"; packageName = "lru-memoizer"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz"; - sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; + url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz"; + sha512 = "QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw=="; }; }; "lru_map-0.3.3" = { @@ -6853,13 +6862,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimist-1.2.7" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "minipass-3.3.6" = { @@ -6871,13 +6880,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.1" = { + "minipass-4.0.3" = { name = "minipass"; packageName = "minipass"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.1.tgz"; - sha512 = "V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz"; + sha512 = "OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw=="; }; }; "minipass-collect-1.0.2" = { @@ -6952,6 +6961,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-2.1.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; + sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -7006,13 +7024,13 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.13.0" = { + "mongodb-4.14.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; - sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.14.0.tgz"; + sha512 = "coGKkWXIBczZPr284tYKFLg+KbGPPLlSbdgfKAb6QqCFt5bo5VFZ50O3FFzsw4rnkqjwT6D8Qcoo9nshYKM7Mg=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -7141,49 +7159,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.153.0" = { + "n8n-core-0.154.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.153.0"; + version = "0.154.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.153.0.tgz"; - sha512 = "m5yikbWxe2IgA2P1ryUzlE4alNWPDha1vF3zoIgHfdZObR7UyoYohlJpT6l5LUcduCQVE87t1rspnJd4MY0hrQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz"; + sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ=="; }; }; - "n8n-design-system-0.52.0" = { + "n8n-design-system-0.53.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.52.0"; + version = "0.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.52.0.tgz"; - sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.53.0.tgz"; + sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw=="; }; }; - "n8n-editor-ui-0.180.0" = { + "n8n-editor-ui-0.181.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.180.0"; + version = "0.181.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.0.tgz"; - sha512 = "Xbjumqnc9chwVWDulXsIhXZ8r9i1nYUzJGBepC6xNM8kTaCRwCokfxUALfFPGNRUBg/A47ez89TNgDY9Mu/X3w=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz"; + sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw=="; }; }; - "n8n-nodes-base-0.212.0" = { + "n8n-nodes-base-0.213.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.212.0"; + version = "0.213.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.0.tgz"; - sha512 = "OENgQkAU70krTAoElQkQTX61Bh/rz2cpip+WDFea+KTXTBqU1gQDNlt3IZdhkS1l0F4e1VfblQawqMeJVFxwbA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz"; + sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw=="; }; }; - "n8n-workflow-0.135.0" = { + "n8n-workflow-0.136.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.135.0"; + version = "0.136.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.135.0.tgz"; - sha512 = "4KTWgul6DHk7rOP2Pj2XsEw4wWfJo29CCLXImgMHkOqR0SWxZT2lRvlqggxlDD1KkmnEddHghLzxOCGxgRHxFg=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz"; + sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA=="; }; }; "named-placeholders-1.1.3" = { @@ -7294,13 +7312,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.33.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.33.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.33.0.tgz"; + sha512 = "7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog=="; }; }; "node-abort-controller-2.0.0" = { @@ -7672,13 +7690,13 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.4.0" = { + "open-8.4.1" = { name = "open"; packageName = "open"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; + sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; }; }; "openapi-types-10.0.0" = { @@ -8401,13 +8419,13 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; - "prettier-2.8.3" = { + "prettier-2.8.4" = { name = "prettier"; packageName = "prettier"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; - sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; + sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; }; }; "pretty-bytes-5.6.0" = { @@ -8545,13 +8563,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.1" = { + "protobufjs-7.2.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz"; - sha512 = "L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.2.tgz"; + sha512 = "++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q=="; }; }; "proxy-addr-2.0.7" = { @@ -10156,13 +10174,13 @@ 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" = { @@ -10435,13 +10453,13 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typeorm-0.3.11" = { + "typeorm-0.3.12" = { name = "typeorm"; packageName = "typeorm"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz"; - sha512 = "pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.12.tgz"; + sha512 = "sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -10804,13 +10822,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" = { @@ -11164,6 +11182,15 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; + "ws-8.12.0" = { + name = "ws"; + packageName = "ws"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; + }; + }; "xlsx-0.17.5" = { name = "xlsx"; packageName = "xlsx"; @@ -11359,10 +11386,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.214.0"; + version = "0.215.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.214.0.tgz"; - sha512 = "nCwdAvgweOtKOg1ZAMLNoc9PgKBFPHAob3+2mw1UAqV0O+pBFcearssVMczcqiH9yr+PYkL4FKqvrPkB292Iwg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz"; + sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11376,97 +11403,53 @@ in sources."js-yaml-4.1.0" ]; }) - (sources."@azure/abort-controller-1.1.0" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-auth-1.4.0" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-client-1.7.1" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + sources."@azure/core-client-1.7.1" (sources."@azure/core-http-2.3.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.1.2" - sources."tslib-2.5.0" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.5.1" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-paging-1.5.0" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-rest-pipeline-1.10.1" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-tracing-1.0.1" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/core-util-1.1.1" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."@azure/core-lro-2.5.1" + sources."@azure/core-paging-1.5.0" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.1.1" (sources."@azure/identity-2.1.0" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" - sources."open-8.4.0" - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/keyvault-keys-4.6.0" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."@azure/logger-1.0.3" // { - dependencies = [ - sources."tslib-2.5.0" + sources."open-8.4.1" ]; }) + sources."@azure/keyvault-keys-4.6.0" + sources."@azure/logger-1.0.3" sources."@azure/ms-rest-azure-env-2.0.0" (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ sources."form-data-2.5.1" + sources."tslib-1.14.1" ]; }) 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" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.5.0" ]; }) sources."@babel/parser-7.20.15" @@ -11475,10 +11458,10 @@ in sources."@codemirror/commands-6.2.0" sources."@codemirror/lang-css-6.0.2" sources."@codemirror/lang-javascript-6.1.3" - sources."@codemirror/language-6.4.0" + sources."@codemirror/language-6.5.0" sources."@codemirror/lint-6.1.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.7.3" + sources."@codemirror/view-6.8.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11487,9 +11470,9 @@ in sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.2.1" // { + (sources."@fortawesome/free-regular-svg-icons-6.3.0" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-common-types-6.3.0" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -11518,7 +11501,7 @@ in dependencies = [ sources."@grpc/proto-loader-0.7.4" sources."long-5.2.1" - sources."protobufjs-7.2.1" + sources."protobufjs-7.2.2" sources."yargs-16.2.0" ]; }) @@ -11551,7 +11534,7 @@ in sources."@lezer/common-1.0.2" sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" - sources."@lezer/html-1.3.0" + sources."@lezer/html-1.3.1" sources."@lezer/javascript-1.4.1" sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" @@ -11571,15 +11554,10 @@ in ]; }) sources."@oclif/command-1.8.22" - (sources."@oclif/config-1.18.8" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."@oclif/config-1.18.8" (sources."@oclif/core-1.26.1" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" ]; }) @@ -11594,15 +11572,10 @@ in (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.10" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."@oclif/parser-3.8.10" sources."@oclif/screen-3.0.4" sources."@opentelemetry/api-1.4.0" sources."@protobufjs/aspromise-1.1.2" @@ -11633,19 +11606,35 @@ in sources."domhandler-5.0.3" ]; }) - 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."@sentry/core-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/integrations-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.37.1" + (sources."@sentry/utils-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.32" - sources."@swc/wasm-1.3.32" + sources."@swc/core-1.3.35" + sources."@swc/wasm-1.3.35" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -11656,17 +11645,16 @@ 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-jwt-0.0.42" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" - sources."@types/express-unless-2.0.1" sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" + sources."@types/jsonwebtoken-9.0.1" sources."@types/lodash-4.14.191" 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.13.0" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11679,9 +11667,10 @@ in sources."@types/stack-trace-0.0.29" sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" + sources."@types/triple-beam-1.3.2" 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" @@ -11753,11 +11742,7 @@ in sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.8.0" sources."assert-plus-1.0.0" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."ast-types-0.13.4" sources."async-3.2.4" sources."async-validator-1.8.5" sources."asynckit-0.4.0" @@ -11769,7 +11754,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1308.0" // { + (sources."aws-sdk-2.1313.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11800,7 +11785,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" @@ -11834,7 +11819,7 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - (sources."bull-4.10.3" // { + (sources."bull-4.10.4" // { dependencies = [ sources."cron-parser-4.7.1" ]; @@ -11855,16 +11840,8 @@ in sources."call-me-maybe-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."capital-case-1.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."camel-case-4.1.2" + sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."cfb-1.2.2" // { @@ -11873,11 +11850,7 @@ in ]; }) sources."chalk-4.1.2" - (sources."change-case-4.1.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."change-case-4.1.2" sources."chardet-0.7.0" sources."charenc-0.0.2" (sources."checkpoint-stream-0.1.2" // { @@ -11943,11 +11916,7 @@ in sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" - (sources."constant-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."constant-case-3.0.4" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."convict-6.2.4" @@ -11996,7 +11965,7 @@ in sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -12013,11 +11982,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" sources."duplexify-3.7.1" @@ -12075,7 +12040,6 @@ in ]; }) sources."express-prom-bundle-6.6.0" - sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" (sources."external-editor-3.1.0" // { @@ -12161,6 +12125,7 @@ in sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ + sources."@tootallnate/once-1.1.2" sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -12223,11 +12188,7 @@ in sources."has-unicode-2.0.1" sources."hdb-pool-0.1.6" sources."he-1.2.0" - (sources."header-case-2.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."header-case-2.0.4" sources."heap-0.2.7" sources."help-me-1.1.0" sources."highlight.js-10.7.3" @@ -12245,14 +12206,14 @@ in sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-duration-3.28.0" 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" // { @@ -12275,9 +12236,9 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."interpret-1.4.0" - (sources."ioredis-5.3.0" // { + (sources."ioredis-5.3.1" // { dependencies = [ sources."denque-2.1.0" ]; @@ -12334,8 +12295,9 @@ in sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" + sources."jose-4.11.4" sources."jquery-3.6.3" - sources."js-base64-3.7.4" + sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" @@ -12363,12 +12325,7 @@ in sources."jsonwebtoken-9.0.0" sources."jsprim-1.4.2" sources."jwa-1.4.1" - (sources."jwks-rsa-1.12.3" // { - dependencies = [ - sources."jsonwebtoken-8.5.1" - sources."semver-5.7.1" - ]; - }) + sources."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" @@ -12427,16 +12384,12 @@ 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.1" sources."long-4.0.0" sources."lossless-json-1.0.5" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."lower-case-2.0.2" sources."lru-cache-4.0.2" - sources."lru-memoizer-2.1.4" + sources."lru-memoizer-2.2.0" sources."lru_map-0.3.3" sources."luxon-3.2.1" (sources."mailparser-3.6.3" // { @@ -12455,6 +12408,8 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-6.0.0" sources."minipass-3.3.6" sources."socks-proxy-agent-6.2.1" @@ -12486,8 +12441,8 @@ in sources."brace-expansion-1.1.11" ]; }) - sources."minimist-1.2.7" - sources."minipass-4.0.1" + sources."minimist-1.2.8" + sources."minipass-4.0.3" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12535,7 +12490,7 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.40" sources."monaco-editor-0.33.0" - sources."mongodb-4.13.0" + sources."mongodb-4.14.0" (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" @@ -12547,11 +12502,16 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" + sources."ws-7.5.9" ]; }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - sources."msal-1.4.17" + (sources."msal-1.4.17" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."msgpackr-1.8.3" (sources."mssql-8.1.4" // { dependencies = [ @@ -12568,26 +12528,30 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.153.0" // { + (sources."n8n-core-0.154.1" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" ]; }) - (sources."n8n-design-system-0.52.0" // { + (sources."n8n-design-system-0.53.0" // { dependencies = [ sources."argparse-2.0.1" sources."markdown-it-12.3.2" sources."vue2-boring-avatars-0.3.8" ]; }) - sources."n8n-editor-ui-0.180.0" - (sources."n8n-nodes-base-0.212.0" // { + sources."n8n-editor-ui-0.181.1" + (sources."n8n-nodes-base-0.213.1" // { dependencies = [ sources."chokidar-3.5.2" ]; }) - sources."n8n-workflow-0.135.0" + (sources."n8n-workflow-0.136.1" // { + dependencies = [ + sources."ast-types-0.15.2" + ]; + }) (sources."named-placeholders-1.1.3" // { dependencies = [ sources."lru-cache-7.14.1" @@ -12603,12 +12567,8 @@ in sources."neo-async-2.6.2" sources."netmask-2.0.2" sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - sources."node-abi-3.31.0" + sources."no-case-3.0.4" + sources."node-abi-3.33.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" @@ -12676,18 +12636,19 @@ in sources."p-map-2.1.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" - sources."pac-proxy-agent-5.0.0" + (sources."pac-proxy-agent-5.0.0" // { + dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" + ]; + }) (sources."pac-resolver-5.0.1" // { dependencies = [ sources."ip-1.1.8" ]; }) sources."packet-reader-1.0.0" - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -12695,11 +12656,7 @@ in sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseley-0.11.0" sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."pascal-case-3.1.2" sources."passport-0.6.0" sources."passport-cookie-1.0.9" sources."passport-jwt-4.0.1" @@ -12709,11 +12666,7 @@ in sources."ansi-escapes-3.2.0" ]; }) - (sources."path-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."path-case-3.0.4" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -12780,7 +12733,7 @@ in }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" @@ -12799,6 +12752,8 @@ in sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-5.1.1" sources."yallist-3.1.1" ]; @@ -12843,7 +12798,6 @@ in (sources."recast-0.21.5" // { dependencies = [ sources."ast-types-0.15.2" - sources."tslib-2.5.0" ]; }) sources."rechoir-0.6.2" @@ -12897,7 +12851,11 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.2" @@ -12927,11 +12885,7 @@ in sources."ms-2.1.3" ]; }) - (sources."sentence-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."sentence-case-3.0.4" sources."seq-queue-0.0.5" sources."serialize-javascript-5.0.1" sources."serve-static-1.15.0" @@ -12957,11 +12911,7 @@ in sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - (sources."snake-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."snake-case-3.0.4" (sources."snowflake-sdk-1.6.18" // { dependencies = [ sources."axios-0.27.2" @@ -13067,12 +13017,7 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."teeny-request-7.2.0" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - ]; - }) + sources."teeny-request-7.2.0" sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" @@ -13083,12 +13028,8 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.5.2" - (sources."title-case-3.0.3" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."tinycolor2-1.6.0" + sources."title-case-3.0.3" sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -13114,7 +13055,7 @@ in sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" sources."ts-node-10.9.1" - sources."tslib-1.14.1" + sources."tslib-2.5.0" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" @@ -13124,12 +13065,20 @@ in sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - (sources."typeorm-0.3.11" // { + (sources."typeorm-0.3.12" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.12" - sources."@azure/identity-1.5.2" + (sources."@azure/identity-1.5.2" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@azure/msal-common-4.5.1" - sources."@azure/msal-node-1.0.0-beta.6" + (sources."@azure/msal-node-1.0.0-beta.6" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" sources."bl-2.2.1" @@ -13137,6 +13086,7 @@ in sources."buffer-6.0.3" sources."cliui-8.0.1" sources."dotenv-16.0.3" + sources."glob-8.1.0" sources."js-yaml-4.1.0" sources."jsbi-3.2.5" (sources."jsonwebtoken-8.5.1" // { @@ -13146,7 +13096,8 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."mkdirp-1.0.4" + sources."minimatch-5.1.6" + sources."mkdirp-2.1.3" sources."mongodb-3.7.3" sources."mssql-7.3.5" sources."node-abort-controller-2.0.0" @@ -13158,7 +13109,7 @@ in sources."bl-5.1.0" ]; }) - sources."tslib-2.5.0" + sources."uuid-9.0.0" sources."wrap-ansi-7.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" @@ -13177,16 +13128,8 @@ in sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" - (sources."upper-case-2.0.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) - (sources."upper-case-first-2.0.2" // { - dependencies = [ - sources."tslib-2.5.0" - ]; - }) + sources."upper-case-2.0.2" + sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" (sources."url-0.10.3" // { dependencies = [ @@ -13227,7 +13170,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" @@ -13272,7 +13215,7 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-8.12.0" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 50949da7539a..0b6d71b3adc9 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/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/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index ab7cb9bffa45..260a7dd4ddd7 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/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/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index e409551f1232..6355f2418b66 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.6"; + version = "3.7.3"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; + sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; }; patches = [ diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/applications/networking/p2p/dht/default.nix index b1d01f82876e..6765c029ffe2 100644 --- a/pkgs/applications/networking/p2p/dht/default.nix +++ b/pkgs/applications/networking/p2p/dht/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dht"; - version = "0.25"; + version = "0.27"; src = fetchFromGitHub { - # Use transmission fork from post-0.25-transmission branch + # Use transmission fork from post-0.27-transmission branch owner = "transmission"; repo = pname; - rev = "25e12bb39eea3d433602de6390796fec8a8f3620"; - sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s="; + rev = "015585510e402a057ec17142711ba2b568b5fd62"; + sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 319a5e7f0dc8..64394696caf0 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,14 +10,14 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); mkDerivation rec { - pname = "qbittorrent"; - version = "4.4.5"; + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; + version = "4.5.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; + hash = "sha256-mDjY6OAegMjU/z5+/BUbodxJjntFbk5bsfOfqIWa87o="; }; enableParallelBuilding = true; @@ -43,8 +43,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} - cp -R src/qbittorrent.app $out/Applications - makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent + cp -R src/${pname}.app $out/Applications + makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 13175aaca671..caba7159214e 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,12 @@ let pname = "pcloud"; - version = "1.10.0"; - code = "XZCy4sVZGb7r8VpDE4SCv2QI3OYx1HYChIvy"; + version = "1.10.1"; + code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-kzID1y/jVuqFfD/PIUR2TFa0AvxKVcfNQ4ZXiHx0gRk="; + hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index eae9a8a3d87a..33747e2d669b 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -4,8 +4,11 @@ , fetchpatch , openssl , libsamplerate +, swig , alsa-lib , AppKit +, python3 +, pythonSupport ? true }: stdenv.mkDerivation rec { @@ -33,6 +36,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = + lib.optionals pythonSupport [ swig python3 ]; + buildInputs = [ openssl libsamplerate ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; @@ -41,11 +47,24 @@ stdenv.mkDerivation rec { export LD=$CC ''; + postBuild = lib.optionalString pythonSupport '' + make -C pjsip-apps/src/swig/python + ''; + + outputs = [ "out" ] + ++ lib.optional pythonSupport "py"; + + configureFlags = [ "--enable-shared" ]; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua mkdir -p $out/share/${pname}-${version}/samples cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples + '' + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python setup.py install --prefix=$py + ) ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f127d7c53d32..759388cbd425 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/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/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f51c8d051a51..74b68bfdcc27 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.40"; + version = "3.42"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; + hash = "sha256-MolxbV+B/u2v+9dcdia1QzvElxX5arZMpu1DnRvUam4="; }; - vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; + vendorHash = "sha256-79nX7l++brumkuFjKuDKxw6EhH0U+aYpia8fdSyY208="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 6dc59e1432ab..074d636ff821 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/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/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index ae424a1fe50a..58ffecef723a 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/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/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f24e1255d5e8..6c6dddee1735 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/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/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e74084e14c52..d221324b205b 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,16 +1,16 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: +{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; + hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; }; vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; @@ -22,7 +22,12 @@ let buildPhase = '' runHook preBuild - go run build.go -no-upgrade -version v${version} build ${target} + ( + export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD + go build build.go + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + ) + ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild ''; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index dea70ffacdce..850692f18547 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.0-13258"; + version = "3.2.1-13272"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; + sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; + sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 0c47fc323a64..23c7916354fd 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/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/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 700a94429964..f9e9ec57704c 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,11 @@ stdenv.mkDerivation rec { # guile warning GUILE_AUTO_COMPILE="0"; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=use-after-free" + ]; + # `make check` target does not define its prerequisites but expects them to # have already been built. The list of targets below was built through trial # and error based on failing tests. diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix new file mode 100644 index 000000000000..acec5f7cabf7 --- /dev/null +++ b/pkgs/applications/office/iotas/default.nix @@ -0,0 +1,76 @@ +{ lib +, python3 +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, librsvg +, libsecret +, libadwaita +, gtksourceview5 +, webkitgtk_5_0 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "iotas"; + version = "0.1.9"; + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "cheywood"; + repo = pname; + rev = version; + hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libsecret + libadwaita + gtksourceview5 + webkitgtk_5_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pygtkspellcheck + requests + markdown-it-py + linkify-it-py + mdit-py-plugins + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Simple note taking with mobile-first design and Nextcloud sync"; + homepage = "https://gitlab.gnome.org/cheywood/iotas"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index 861ec4d99ef0..e3e3106b8302 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/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/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index e885e03c1cd2..181c627f238c 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,30 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3, gpgme +, installShellFiles, texinfo, gnused, usePython ? false, gpgmeSupport ? false }: stdenv.mkDerivation rec { pname = "ledger"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; rev = "v${version}"; - sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"; + hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic="; }; - outputs = [ "out" "dev" "py" ]; + outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ]; buildInputs = [ - (boost.override { enablePython = usePython; python = python3; }) gmp mpfr libedit gnused - ] ++ lib.optional usePython python3; + ] ++ lib.optionals gpgmeSupport [ + gpgme + ] ++ (if usePython + then [ python3 (boost.override { enablePython = true; python = python3; }) ] + else [ boost ]); nativeBuildInputs = [ cmake texinfo installShellFiles ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" - (lib.optionalString usePython "-DUSE_PYTHON=true") + "-DUSE_PYTHON:BOOL=${if usePython then "ON" else "OFF"}" + "-DUSE_GPGME:BOOL=${if gpgmeSupport then "ON" else "OFF"}" ]; # by default, it will query the python interpreter for it's sitepackages location @@ -34,22 +38,6 @@ stdenv.mkDerivation rec { --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"' ''; - patches = [ - # Add support for $XDG_CONFIG_HOME. Remove with the next release - (fetchpatch { - url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch"; - sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; - excludes = [ "doc/NEWS.md" ]; - }) - - # Fix included bug with boost >= 1.76. Remove with the next release - (fetchpatch { - url = "https://github.com/ledger/ledger/commit/1cb9b84fdecc5604bd1172cdd781859ff3871a52.patch"; - sha256 = "sha256-ipVkRcTmnEvpfyPgMzLVJ9Sz8QxHeCURQI5dX8xh758="; - excludes = [ "test/regress/*" ]; - }) - ]; - installTargets = [ "doc" "install" ]; postInstall = '' @@ -57,17 +45,16 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; + homepage = "https://www.ledger-cli.org/"; + changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md"; license = licenses.bsd3; - longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed from the UNIX command-line. This may put off some users, as there is no flashy UI, but for those who want unparalleled reporting access to their data, there really is no alternative. ''; - platforms = platforms.all; maintainers = with maintainers; [ jwiegley marsam ]; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fdf76152a652..6590e6255770 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/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/pkgs/applications/office/paper-note/default.nix b/pkgs/applications/office/paper-note/default.nix index e400c88df5dd..e9fdd485befd 100644 --- a/pkgs/applications/office/paper-note/default.nix +++ b/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/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ee621df4d837..ca6cab2c1e4f 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -11,6 +11,7 @@ , fabulous , getkey , psutil +, shared-mime-info , pkgs }: @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + shared-mime-info openpaperwork-gtk ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 980a4aabf7ab..6323c2c417b8 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; + sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e0bfa57b1e8d..38a15e8bef01 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/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/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 9fe6221d494d..65fab41df949 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.2"; + version = "23.2.0"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU="; + sha256 = "sha256-S5m78E1wrWBu/bMmNUmv/ZprebyYPC9NDfINU2C/i8w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix new file mode 100644 index 000000000000..5dd412a45022 --- /dev/null +++ b/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/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index fc1087ab2d93..9b7c58ef5c93 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.12.1"; + version = "7.12.2"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; + sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 5566906919a8..4ddbd42259d1 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-01-23"; + version = "unstable-2023-02-14"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; - sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; + rev = "16d449a3bf2805c1fc683fdc183e0e8390074252"; + sha256 = "jm6bLu+6G3VMSyB56B5qATqFZ3sXjm8s66Gx2oZyvFA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 03e88a7816d6..e48355660cb2 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -6,13 +6,13 @@ let pname = "trilium-desktop"; - version = "0.58.7"; + version = "0.58.8"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; + linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa"; + darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 349ae7f4c331..78bae4f4655b 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - version = "0.58.7"; + serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; + version = "0.58.8"; in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 8158e4d6ea6e..7a7e48d736d0 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -3,11 +3,12 @@ , cmake , corrosion , extra-cmake-modules -, gcc11 +, gcc12 , kconfig , 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. @@ -45,7 +46,7 @@ mkDerivation rec { cmake corrosion extra-cmake-modules - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo @@ -57,6 +58,7 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kirigami-addons kirigami2 knotifications kpurpose diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix index cb87fe0ed24d..14bfc6d18917 100644 --- a/pkgs/applications/plasma-mobile/audiotube.nix +++ b/pkgs/applications/plasma-mobile/audiotube.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules -, gcc11 +, gcc12 , wrapGAppsHook , gst_all_1 @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 python3Packages.wrapPython python3Packages.pybind11 ]; diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 86a4f1d10071..9efbaa603395 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -78,6 +78,7 @@ let plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; + qmlkonsole = callPackage ./qmlkonsole.nix {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 96bb4eb0907c..ffcf74a5f715 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/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/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix index 1903bf259bae..59b455398203 100644 --- a/pkgs/applications/plasma-mobile/kasts.nix +++ b/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/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix index 49dcb1db99f7..d6a1f999ce65 100644 --- a/pkgs/applications/plasma-mobile/kweather.nix +++ b/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/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix index 2f655d5a9e09..8b3da82b8b88 100644 --- a/pkgs/applications/plasma-mobile/neochat.nix +++ b/pkgs/applications/plasma-mobile/neochat.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv +{ gcc12Stdenv , lib , srcs @@ -31,7 +31,7 @@ }: # Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "neochat"; inherit (srcs.neochat) version src; diff --git a/pkgs/applications/plasma-mobile/plasmatube/default.nix b/pkgs/applications/plasma-mobile/plasmatube/default.nix index 81041b22931d..c9753babeaaf 100644 --- a/pkgs/applications/plasma-mobile/plasmatube/default.nix +++ b/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/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/plasma-mobile/qmlkonsole.nix new file mode 100644 index 000000000000..da892fb47c0e --- /dev/null +++ b/pkgs/applications/plasma-mobile/qmlkonsole.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, ki18n +, kirigami-addons +, kirigami2 +, kcoreaddons +, qtquickcontrols2 +, kwindowsystem +, qmltermwidget +}: + +mkDerivation { + pname = "qmlkonsole"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + ki18n + kirigami-addons + kirigami2 + qtquickcontrols2 + kcoreaddons + kwindowsystem + qmltermwidget + ]; + + meta = with lib; { + description = "Terminal app for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole"; + license = with licenses; [ gpl2Plus gpl3Plus cc0 ]; + maintainers = with maintainers; [ balsoft ]; + }; +} diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 7ec5541f48c8..c120851e5b2e 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, gcc11Stdenv +, gcc12Stdenv , srcs , cmake @@ -12,6 +12,7 @@ , kcontacts , ki18n , kio +, kirigami-addons , kirigami2 , knotifications , kpeople @@ -23,8 +24,8 @@ , qtquickcontrols2 }: -# Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +# Workaround for AArch64 still using GCC9. +gcc12Stdenv.mkDerivation rec { pname = "spacebar"; inherit (srcs.spacebar) version src; @@ -40,6 +41,7 @@ gcc11Stdenv.mkDerivation rec { kcontacts ki18n kio + kirigami-addons kirigami2 knotifications kpeople diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index a30966847a59..42e0612cf8cb 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/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/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix index a412835c8ccd..f93336d40fa8 100644 --- a/pkgs/applications/plasma-mobile/tokodon.nix +++ b/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/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index ff6aaf35bea0..bdbc22cb787d 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -37,20 +37,18 @@ rec { ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "native" info then info.native else []) ++ - (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "native" info) info.native) ++ + (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative) + ) ) ) featuresInfo); buildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "runtime" info then info.runtime else []) ++ - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "runtime" info) info.runtime) ++ + (lib.optionals (builtins.hasAttr "pythonRuntime" info) info.pythonRuntime) + ) ) ) featuresInfo); cmakeFlags = lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 926022353e41..c38c89fc459b 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -41,12 +41,9 @@ let ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( - if unwrapped.hasFeature feat then - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals ((unwrapped.hasFeature feat) && (builtins.hasAttr "pythonRuntime" info)) info.pythonRuntime ) - ) unwrapped.featuresInfo) + ) unwrapped.featuresInfo) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index cfb1f367ad80..9a48854ccc69 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/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/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 1180f5a941ae..647f3efd6706 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/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/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 79a9fdb51ced..aa89d8819751 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -9,11 +9,11 @@ docbook_xsl_ns, wrapQtAppsHook, libusb1, - libyamlcpp, qtlocation, qtserialport, qttools, qtbase, + yaml-cpp, }: let @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libyamlcpp libusb1 qtlocation qtserialport qttools qtbase + yaml-cpp ]; postPatch = lib.optionalString isLinux '' @@ -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/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 75fb91d5ce6a..bc853ae14fcc 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,18 +1,18 @@ -{ lib, python38Packages, fetchPypi -, fftw, alsa-lib, pulseaudio, wxPython_4_0 }: +{ lib, python39Packages, fetchPypi +, fftw, alsa-lib, pulseaudio, pyusb, wxPython_4_0 }: -python38Packages.buildPythonApplication rec { +python39Packages.buildPythonApplication rec { pname = "quisk"; - version = "4.1.73"; + version = "4.2.12"; src = fetchPypi { inherit pname version; - sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; + sha256 = "62b017d881139ed38bd906b0467b303fbdae17e5607e93b6b2fe929e26d0551d"; }; buildInputs = [ fftw alsa-lib pulseaudio ]; - propagatedBuildInputs = [ wxPython_4_0 ]; + propagatedBuildInputs = [ pyusb wxPython_4_0 ]; doCheck = false; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index fa3f566b3f0c..abba5c620498 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/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/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index adf997773ecc..59a1e0f59acc 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/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/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 703416f074aa..50eee7d3aa3f 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct22b"; - version = "20221001_b"; + srcVersion = "feb23a"; + version = "20230201_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; + sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch deleted file mode 100644 index 3bbcb9f36e99..000000000000 --- a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py ---- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 -+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 -@@ -32,7 +32,7 @@ - libs.insert(0, '-L' + getvar('LIBDIR')) - - # Framework (specific for Mac) --if not getvar('PYTHONFRAMEWORK'): -- libs.extend(getvar('LINKFORSHARED').split()) -+#if not getvar('PYTHONFRAMEWORK'): -+# libs.extend(getvar('LINKFORSHARED').split()) - - print(' '.join(libs)) diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index d74ad2c4e878..3769948fd3ef 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/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/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 6cdae4cb53a2..bd878312d8de 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-tcUVWfb/EtJ6heJjQ3989uNjkWa6FocReJ5gjE35AMY="; + sha256 = "sha256-OT5Fi/rC3VmQ97SuqlXOTf8RAT0Zj4/Oy86T1v7hBkA="; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 9aa655932d35..c555a30b15a8 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE="; + hash = "sha256-6R2gl2l2Cl/eva0g+kxDLBI2+5T9cFTgaGMsEfeDVU0="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index f6d767235b7f..ec97f0e6aa31 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/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/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index 8ea115c6b25d..b4999193e177 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inormalize"; - name = "${pname}-2014-10-21"; + version = "unstable-2014-10-21"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 7a101e6e19dc..0104a5506bc6 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1445"; + version = "1447"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-E3D9KmCIVcwXblwJ0wePk0wKoXwKA2UsSGqfMmRsw2A="; + hash = "sha256-zts1F2tFeBP7CQifpc2M4i6duK8FA7hQXTOizv8/kWM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index e8aef4138b05..42178722b551 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -4,8 +4,7 @@ stdenv.mkDerivation rec { pname = "minc-widgets"; - name = "${pname}-2016-04-20"; - + version = "unstable-2016-04-20"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix new file mode 100644 index 000000000000..01874763901b --- /dev/null +++ b/pkgs/applications/science/biology/nest/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, testers +, cmake +, gsl +, libtool +, mpi +, nest +, pkg-config +, python3 +, readline +, autoPatchelfHook +, withPython ? false +, withMpi ? false +}: + +stdenv.mkDerivation rec { + pname = "nest"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nest"; + repo = "nest-simulator"; + rev = "v${version}"; + sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU="; + }; + + postPatch = '' + patchShebangs cmake/CheckFiles/check_return_val.sh + # fix PyNEST installation path + # it expects CMAKE_INSTALL_LIBDIR to be relative + substituteInPlace cmake/ProcessOptions.cmake \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/python" "lib/python" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + autoPatchelfHook + ]; + + buildInputs = [ + gsl + readline + libtool # libltdl + ] ++ lib.optionals withPython [ + python3 + python3.pkgs.cython + ] ++ lib.optional withMpi mpi; + + cmakeFlags = [ + "-Dwith-python=${if withPython then "ON" else "OFF"}" + "-Dwith-mpi=${if withMpi then "ON" else "OFF"}" + "-Dwith-openmp=${if stdenv.isDarwin then "OFF" else "ON"}" + ]; + + passthru.tests.version = testers.testVersion { + package = nest; + command = "nest --version"; + }; + + meta = with lib; { + description = "NEST is a command line tool for simulating neural networks"; + homepage = "https://www.nest-simulator.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ jiegec ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 659b1e97f200..b7c8c138cb82 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VaUr63v7mzhh4VBghH7a7qrqOYwl6vucmmKzTi9yAjY="; }) ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + ]; + postInstall = '' mkdir $out/bin mv $out/octopus $out/bin diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index b21ef2d71d6c..00fd0ff0083e 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h - ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + ${lib.optionalString stdenv.cc.isClang "sed -i 's|g++|clang++|g' Makefile.std"} makeFlagsArray+=( ZLIB=-lz diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 5fcb367ce5cb..04ef7c2e062b 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/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/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 8b9b086b77b2..2c0cad05596a 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/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/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b5b5be84c8ec..98f7ccbfee02 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.83"; + version = "16.1.3"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; + sha256 = "sha256-k1F4OaER9vg8GIi4eqppeh2f0MtlcBSfd4zkewFp2As="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/applications/science/chemistry/mopac/default.nix new file mode 100644 index 000000000000..d2b2b558bb78 --- /dev/null +++ b/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/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix new file mode 100644 index 000000000000..1e76a3059534 --- /dev/null +++ b/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/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index d0058c8650d8..cc145baef037 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { ]; configureFlags = with lib; [ - "--with-yaml-prefix=${libyaml}" + "--with-yaml-prefix=${lib.getDev libyaml}" "--with-blas=-lblas" "--with-lapack=-llapack" - "--with-fftw-prefix=${fftw.dev}" - "--with-gsl-prefix=${gsl}" - "--with-libxc-prefix=${libxc}" + "--with-fftw-prefix=${lib.getDev fftw}" + "--with-gsl-prefix=${lib.getDev gsl}" + "--with-libxc-prefix=${lib.getDev libxc}" "--enable-openmp" ] ++ optional enableFma "--enable-fma3" ++ optional enableFma4 "--enable-fma4" diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix new file mode 100644 index 000000000000..455588ee17d1 --- /dev/null +++ b/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/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index b02082e5b6cd..2e882aff361d 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/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/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index 10bae3c0fdf4..f6b0ff93fff5 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/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/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 0515809dffeb..72b931f1d11c 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/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/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch deleted file mode 100644 index cdc5a777c49d..000000000000 --- a/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/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index d7250db07b49..697c27842081 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -22,6 +22,7 @@ , libXdmcp , lndir , unixODBC +, fetchpatch , util-linux , libselinux @@ -34,6 +35,7 @@ , at-spi2-core , libXtst , pcre2 +, libdeflate , swig4 , python @@ -50,7 +52,6 @@ , withNgspice , withScripting , withI18n -, withPCM , debug , sanitizeAddress , sanitizeThreads @@ -71,16 +72,28 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + ] + ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release + [ + (fetchpatch { # for wxGTK 3.2.2.1's .1 field + name = "support wxWidgets subrelease field"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; + hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; + }) + (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython + name = "relax wxPython check to just major.minor"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; + hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; + }) ]; # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - postPatch = if (!stable) then '' + postPatch = lib.optionalString (!stable) '' substituteInPlace cmake/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" - '' - else ""; + ''; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -88,6 +101,7 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 ] ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -117,12 +131,6 @@ stdenv.mkDerivation rec { ] ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" - ] - ++ optionals (!withPCM && stable) [ - "-DKICAD_PCM=OFF" - ] - ++ optionals (!stable) [ # upstream issue 12491 - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -167,8 +175,9 @@ stdenv.mkDerivation rec { boost swig4 python + unixODBC + libdeflate ] - ++ optional (!stable) unixODBC ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9765d2fcc1e4..c7eb9d69522c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -24,7 +24,6 @@ , sanitizeThreads ? false , with3d ? true , withI18n ? true -, withPCM ? true # Plugin and Content Manager , srcs ? { } }: @@ -118,7 +117,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n withPCM; + inherit withOCC withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; @@ -150,15 +149,15 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD7_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] ++ optionals (with3d) [ - "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] @@ -172,7 +171,7 @@ stdenv.mkDerivation rec { let bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in (concatStringsSep "\n" (flatten [ @@ -214,7 +213,7 @@ stdenv.mkDerivation rec { description = (if (stable) then "Open Source Electronics Design Automation suite" else "Open Source EDA suite, development build") - + (if (!with3d) then ", without 3D models" else ""); + + (lib.optionalString (!with3d) ", without 3D models"); homepage = "https://www.kicad.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index cc567ae7114d..4562e8447624 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.11"; + version = "7.0.0"; src = { - rev = "2627ca5db025d40933329af642df28c4a2193dbf"; - sha256 = "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq"; + rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; + sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; }; }; libVersion = { - version = "6.0.11"; + version = "7.0.0"; libSources = { - symbols.rev = "c2277d1e39c5e9ba5e04ca5ef3eb252a74291375"; - symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; - templates.rev = "049baf307d2fdf5e6138ebab40a8be720b4ae62e"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "72fb90dda096bd59295ccc2c8c0881ee02a1221c"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "3fc9daed3ca80a1b6f3bbb1ef505f0dc79972d44"; - packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; + symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; + symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; + templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; + footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; + footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; + packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; + packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-12-19"; + version = "2023-02-14"; src = { - rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692"; - sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0"; + rev = "29c4482bc898f627cebcd5f64e063e8a813a5445"; + sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y"; }; }; libVersion = { - version = "2022-12-19"; + version = "2023-02-14"; libSources = { - symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e"; - symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267"; - packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp"; + symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a"; + symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn"; + templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; + templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; + footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf"; + footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk"; + packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e"; + packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw"; }; }; }; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index 53768588c3fa..083f01a42881 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/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/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 33d145c00756..e77f6aeeb29b 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/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/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 4009761e8dc3..d61a9893942f 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/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 = [ @@ -60,9 +60,13 @@ stdenv.mkDerivation rec { --prefix PATH : "$out/share/cbmc" \ ''; - # fix "argument unused during compilation" - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang - "-Wno-unused-command-line-argument"; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + # fix "argument unused during compilation" + "-Wno-unused-command-line-argument" + ]; # TODO: add jbmc support cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8a40216c3ecb..49c9fc47fef2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -66,10 +66,10 @@ let buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; - csdpPatch = if csdp != null then '' + csdpPatch = lib.optionalString (csdp != null) '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; + ''; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } @@ -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: '' @@ -158,7 +158,7 @@ self = stdenv.mkDerivation { UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""} + ${lib.optionalString (!coqAtLeast "8.7") "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\""} ${csdpPatch} ''; @@ -196,7 +196,7 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in optionalString (!coqAtLeast "8.17") '' + postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} @@ -227,12 +227,12 @@ if coqAtLeast "8.17" then self.overrideAttrs(_: { buildPhase = '' runHook preBuild make dunestrap - dune build -p coq-core,coq-stdlib,coq,coqide-server${if buildIde then ",coqide" else ""} -j $NIX_BUILD_CORES + dune build -p coq-core,coq-stdlib,coq,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES runHook postBuild ''; installPhase = '' runHook preInstall - dune install --prefix $out coq-core coq-stdlib coq coqide-server${if buildIde then " coqide" else ""} + dune install --prefix $out coq-core coq-stdlib coq coqide-server${lib.optionalString buildIde " coqide"} runHook postInstall ''; }) else self diff --git a/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch new file mode 100644 index 000000000000..a97665c2f86c --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch @@ -0,0 +1,39 @@ +Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36: + +This update fixes a failure to build with source with bash 5.2. Bash's +`patsub_replacement` feature makes ampersand a special character when doing +variable substitution, which was not previously the case. This update instructs +bash to turn off the new behavior. + +The patch itself is adapted from +https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch. +--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600 +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600 +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600 +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat < libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { urls = [ @@ -22,9 +23,18 @@ 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="; }; + patches = [ + # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 + (fetchpatch { + name = "fix-find_isogenous_from_Atkin.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/bug2441.patch?id=9.8.rc0"; + hash = "sha256-DvOUFlFDnopN+MJY6GYRPNabuoHPFch/nNn+49ygznc="; + }) + ]; + buildInputs = [ gmp libX11 diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 0eecff0a1798..4dc11db532fd 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/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/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index c3a81c2109ee..c4de5da45dbf 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -10,7 +10,7 @@ First you should find out which change to nixpkgs is at fault (if you don't alre If the build broke as a result of a package update, try those solutions in order: -- search the [sage trac](https://trac.sagemath.org/) for keywords like "Upgrade ". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. +- search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade ". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. - check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). @@ -19,7 +19,7 @@ If the build broke as a result of a package update, try those solutions in order ``` [user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage -[user@localhost sage]$ git checkout 8.2 # substitute the relevant version here +[user@localhost sage]$ git checkout 9.8 # substitute the relevant version here ``` Then make the needed changes and generate a patch with `git diff`: @@ -29,42 +29,10 @@ Then make the needed changes and generate a patch with `git diff`: [user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch ``` -Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, [propose them upstream](#proposing-a-sage-patch) and add a link to the trac ticket. +Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details). - pin the package version in `default.nix` and add a note that explains why that is necessary. - -## Proposing a sage patch - -You can [login the sage trac using GitHub](https://trac.sagemath.org/login). Your username will then be `gh-`. The only other way is to request a trac account via email. After that refer to [git the hard way](http://doc.sagemath.org/html/en/developer/manual_git.html#chapter-manual-git) in the sage documentation. The "easy way" requires a non-GitHub account (requested via email) and a special tool. The "hard way" is really not all that hard if you're a bit familiar with git. - -Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then: - -``` -[user@localhost ~]$ git clone https://github.com/sagemath/sage.git -[user@localhost ~]$ cd sage -[user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master -[user@localhost sage]$ git checkout -b u/gh-/ develop -[user@localhost sage]$ -[user@localhost sage]$ git add . -[user@localhost sage]$ git commit -[user@localhost sage]$ git show # review your changes -[user@localhost sage]$ git push --set-upstream trac u/gh-/ -``` - -You now created a branch on the trac server (you *must* follow the naming scheme as you only have push access to branches with the `u/gh-/` prefix). -Now you can [create a new trac ticket](https://trac.sagemath.org/newticket). -- Write a description of the change -- set the type and component as appropriate -- write your real name in the "Authors" field -- write `u/gh-/` in the "Branch" field -- click "Create ticket" -- click "Modify" on the top right of your ticket (for some reason you can only change the ticket status after you have created it) -- set the ticket status from `new` to `needs_review` -- click "Save changes" - -Refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details. - ## I want to update sage You'll need to change the `version` field in `sage-src.nix`. Afterwards just try to build and let nix tell you which patches no longer apply (hopefully because they were adopted upstream). Remove those. @@ -74,5 +42,5 @@ If the problem is not obvious, you can try to first update sage to an intermedia ## Well, that didn't help! -If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping @timokau (or whoever is listed in the `maintainers` list of the sage package). +If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping the sage maintainers (as listed in the sage package). Describe what you did and why it didn't work. Afterwards it would be great if you help the next guy out and improve this documentation! diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 1f8b33f68738..39d358a1f9a8 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -35,7 +35,8 @@ writeTextFile rec { export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_ROOT_DIR='${gap}/share/gap' + export GAP_LIB_DIR='${gap}/lib/gap' + export GAP_SHARE_DIR='${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" diff --git a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch deleted file mode 100644 index 40bbbe23f1a3..000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py -index 86b89632a5..ca8a43b248 100644 ---- a/src/sage/geometry/polyhedron/backend_normaliz.py -+++ b/src/sage/geometry/polyhedron/backend_normaliz.py -@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds - 1.732050807568878? - sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists - sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field -- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]] -+ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]] - """ - from sage.rings.qqbar import number_field_elements_from_algebraics - numbers = [] -diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py -index d2b20f1891..6c31efe239 100644 ---- a/src/sage/lfunctions/pari.py -+++ b/src/sage/lfunctions/pari.py -@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents): - 0.0374412812685155 - - sage: lfun_eta_quotient([6],[4]) -- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1] -+ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1] - - sage: lfun_eta_quotient([2,1,4], [5,-2,-2]) - Traceback (most recent call last): diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d68a2c8a107a..5e18b7415632 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -57,14 +57,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.7"; + version = "9.8"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-MYpCp18wqKwCa+tcJ7He14p1FXDlVm1vubQqQS9g3LY="; + sha256 = "sha256-dDbrzJXsOBARYfJz0r7n3LbaoXHnx7Acz6HBa95NV9o="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -89,14 +89,6 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch - - # https://trac.sagemath.org/ticket/33907 - (fetchSageDiff { - name = "interfaces-expectpy-intermittent.patch"; - base = "9.8.beta6"; - rev = "6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1"; - sha256 = "sha256-z8FQxtrk62MHzPjrUTad+fMAE6XV8GTsLWKgGOM3zBg="; - }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -119,28 +111,12 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch - # https://trac.sagemath.org/ticket/34118 - (fetchSageDiff { - name = "sympy-1.11-upgrade.patch"; - base = "9.7"; - rev = "52815744bde2b682245b6f985a112f7cb8666056"; - sha256 = "sha256-gv6z6JkQ6S6oCJQNkVgcPVvzlplyvR1nC7pWmcUiSc0="; - }) - - # https://trac.sagemath.org/ticket/34460 - (fetchSageDiff { - name = "ipywidgets-8-upgrade.patch"; - base = "9.7"; - rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; - sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; - }) - # https://trac.sagemath.org/ticket/34391 (fetchSageDiff { name = "gap-4.12-upgrade.patch"; - base = "9.8.beta2"; - rev = "eb8cd42feb58963adba67599bf6e311e03424328"; - sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw="; + base = "9.8.beta7"; + rev = "dd4a17281adcda74e11f998ef519b6bd0dafb043"; + sha256 = "sha256-UQT9DO9xd5hh5RucvUkIm+rggPKu8bc1YaSI6LVYH98="; }) # https://trac.sagemath.org/ticket/34701 @@ -151,46 +127,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U="; }) - # https://trac.sagemath.org/ticket/34537 - (fetchSageDiff { - name = "pari-2.15.1-upgrade.patch"; - squashed = true; - base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1 - rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a"; - sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc="; - excludes = ["build/*" - "src/sage/geometry/polyhedron/base_number_field.py" - "src/sage/geometry/polyhedron/backend_normaliz.py" - "src/sage/lfunctions/pari.py"]; - }) - # Some files were excluded from the above patch due to - # conflicts. The patch below contains rebased versions. - ./patches/pari-2.15.1-upgrade-rebased.patch - - # https://trac.sagemath.org/ticket/34668 - (fetchSageDiff { - name = "matplotlib-3.6-upgrade.patch"; - base = "9.8.beta2"; - rev = "5501e0de0dca1cff0355326dd42bd8c7e5749568"; - sha256 = "sha256-ceJkVaecIsZewN8v/3gPQXFbFjv5Akz6zEFg/ToXdek="; - }) - - # https://trac.sagemath.org/ticket/34693 - (fetchSageDiff { - name = "matplotlib-3.6-docbuilding.patch"; - base = "9.8.beta4"; - rev = "64589686c261d33e6b5aff2589bcae8af004bcc6"; - sha256 = "sha256-j5AMY1TmhP+HBBBYaFZSkABJ5vtwe6iP2LRfGEgSm8Q="; - }) - - # https://trac.sagemath.org/ticket/34615 - (fetchSageDiff { - name = "sphinx-5.2-upgrade.patch"; - base = "9.8.beta1"; - rev = "8f8af65e54d3a9962cfab40f15dc23f4e955b43f"; - sha256 = "sha256-yhDdyxnXSSkqLcuOPBWSEBc26rk1Od3gLcWW8S2p8bY="; - }) - # temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669 ./patches/ipywidgets-on_submit-deprecationwarning.patch diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 79d4f78082e0..4910f5e8bf1d 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -18,7 +18,7 @@ let src = sage-with-env.env.lib.src; runAllTests = files == null; testArgs = if runAllTests then "--all" else testFileList; - patienceSpecifier = if longTests then "--long" else ""; + patienceSpecifier = lib.optionalString longTests "--long"; timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}"; relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 665a2924af42..7c28f65f3bf7 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20230127121939"; + version = "3.1.20230213100550"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pEow2vEpQ2+c3fXkB8q7R4pud1xLzE74+HEqcBzg0D8="; + hash = "sha256-BtHkIVadcccnYYX8lRqiCzO+/qFeBaZfdUuu6qrjysk="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix index 088fa83b7d92..ffa0a158ac95 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -16,7 +16,7 @@ let # getAttr-like helper for optional append to string: # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world" # "Hello" + appendByAttr "a" " " {} = "Hello" - appendByAttr = attr: sep: x: if hasAttr attr x then sep + (getAttr attr x) else ""; + appendByAttr = attr: sep: x: lib.optionalString (hasAttr attr x) (sep + (getAttr attr x)); # Are there any OM dependencies at all? ifDeps = length pkg.omdeps != 0; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5093a586a85a..26e6ab12ab04 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/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/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index c3ac1f6e0a8d..ec29c02054df 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , apfel @@ -16,22 +15,15 @@ stdenv.mkDerivation rec { pname = "nnpdf"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "NNPDF"; repo = pname; rev = version; - sha256 = "sha256-Alx4W0TkPzJBsnRXcKBrlEU6jWTnOjrji/IPk+dNCw0="; + hash = "sha256-mwOMNlYFhHZq/wakO1/HGwcxvKGKh5OyFa2D9d3Y3IA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/NNPDF/nnpdf/commit/7943b62a91d3a41fd4f6366b18881d50695f4b45.diff"; - hash = "sha256-UXhTO7vZgJiY8h3bgjg7SQC0gMUQsYQ/V/PgtCEQ7VU="; - }) - ]; - postPatch = '' for file in CMakeLists.txt buildmaster/CMakeLists.txt; do substituteInPlace $file \ diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c037e41d74c6..09ad299d10de 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -19,7 +19,9 @@ , libwpd , libxslt , lyx +, makeWrapper , perl +, perlPackages , pkg-config , poppler_utils , python3Packages @@ -66,6 +68,7 @@ mkDerivation rec { file pkg-config python3Packages.setuptools + makeWrapper which ]; @@ -73,6 +76,7 @@ mkDerivation rec { bison chmlib python3Packages.python + python3Packages.mutagen xapian zlib ] ++ lib.optional withGui [ @@ -111,6 +115,10 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done + wrapProgram $out/share/recoll/filters/rclaudio.py \ + --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rclimg \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' '' + lib.optionalString (stdenv.isDarwin && withGui) '' @@ -130,6 +138,6 @@ mkDerivation rec { changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming ehmry ]; }; } diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 7ae2825f175a..bd80a15d0562 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -18,7 +18,7 @@ , wayland-scanner , pkg-config , utf8proc -, allowPgo ? true +, allowPgo ? !stdenv.hostPlatform.isMusl , python3 # for PGO # for clang stdenv check , foot diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index aad2c367b91f..07980f8375aa 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/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/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f7ba075114b7..04a810cf9e8c 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -26,14 +26,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.39.1"; + version = "2.42.0"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-QQIYyg2zwV7cfFxGHVsLiTRBgTGs3O7OJcmURvfY3LQ="; - deepClone = true; + hash = "sha256-13WEbF6in+zYZXWYqlYA98qJkKxjmcpQY9GuGS+DDtk="; }; format = "pyproject"; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index a60aa27a8439..b74200a6919c 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + preInstall = '' mkdir -p $out/bin ''; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 91b3b0cd9cd1..2006c5efeea0 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/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-2"; 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/c1178655-1589-4afe-90a8-9f5f9f45bf4d"; + hash = "sha256-k/yD2fBEByjj8ZastgRXKI1I4MzVlD8pbUCXwCo7UoQ="; }; 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/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index dcce6f7f3c00..0df0669c41da 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.2.0"; + version = "4.3.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-cH4FhXrdT0ejpyt8G2rSGw9WE9sfOXRkSA9+FVwRmtQ="; + sha256 = "sha256-jlUGtTtoJ3DQbs4VEDUbYyl+s9S+bLTQ+GM6OQg6MNo="; }; - cargoSha256 = "sha256-NmVmqBzRUdumWQ9MzolZTo0VQW9JTjIyYRwUTzGiQZ4="; + cargoHash = "sha256-Mrqg0wOG3JHDdGMZMcFsifpazOukZeoMPrQh4vIfQyU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 9018635ad9b8..3f154f0350c4 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.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/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 27998f1c9c15..e9b4d75bf64a 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8="; + hash = "sha256-siVSZke+anVTaLiJVyDEKvgX+VmS0axa+4721nlgmiw="; }; - cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E="; + cargoHash = "sha256-QMAAKkjWgM/UiOfkNMLQxyGEYYmiSvE0Pd8fZXYyN48="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 24fc850b31b0..9667e7bd2fee 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.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/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 0ef5a678ee8e..a7dbf0c6ba4b 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, libgit2 +, IOKit +, CoreFoundation +, fetchpatch +}: rustPlatform.buildRustPackage rec { pname = "git-trim"; @@ -11,11 +21,22 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; + cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU="; + + cargoPatches = [ + # Update git2 https://github.com/foriequal0/git-trim/pull/202 + (fetchpatch { + url = "https://github.com/foriequal0/git-trim/commit/4355cd1d6f605455087c4d7ad16bfb92ffee941f.patch"; + sha256 = "sha256-C1pX4oe9ZCgvqYTBJeSjMdr0KFyjv2PNVMJDlwCAngY="; + }) + ]; + + OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl libgit2 ] + ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2b6018dfe446..4d9115465769 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "9.0.0"; + version = "9.1.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-I6iIg+RBTz5HyommAvDuQBBURjMm04t31o5OZNCrYGc="; + sha256 = "sha256-HRd2jfTbdFKVMbnD4CzMsE22urExGrpf8rgli3dqVUY="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "1dhswjzyjrfz4psjji53fjpvb8845lv44qqc6ncfv1ljx9ky828r"; + sha256 = "sha256-zJEjJ+l0/S8B2b7mlDd2sln8GsvCaZZIcarC45rLATQ="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "0jzcwx1z240rr08qc6vbasn51bcadz2jl3vm3jwgjpfdwypnsvk1"; + sha256 = "sha256-5wep4FDNZwNOK05tm24132JuyBWUJRyeRpJDF7PLYoQ="; }; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 06eb8d78f06e..63d22703d284 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.8.1", - "repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=", + "version": "15.8.3", + "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.8.1-ee", + "rev": "v15.8.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.8.1", - "GITLAB_PAGES_VERSION": "15.8.1", + "GITALY_SERVER_VERSION": "15.8.3", + "GITLAB_PAGES_VERSION": "15.8.3", "GITLAB_SHELL_VERSION": "14.15.0", - "GITLAB_WORKHORSE_VERSION": "15.8.1" + "GITLAB_WORKHORSE_VERSION": "15.8.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 28452edbfe46..aab5bfbd6a6f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.8.1"; + version = "15.8.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE="; + sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; }; vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 7a808ee2ff64..252be4e56313 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.8.1"; + version = "15.8.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index 7e66985bb886..008d161ce247 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitmux"; - version = "0.7.10"; + version = "0.7.12"; src = fetchFromGitHub { owner = "arl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + sha256 = "sha256-JPrXq4+53cem0TVnm1/AJz/mYcEKaYzqhptJU4V2U0o="; }; - vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + vendorHash = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; # GitHub source does contain a regression test for the module # but it requires networking as it git clones a repo from github diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index d2a51c94727a..df72a64aaa36 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/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/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 9d6bbbd13f67..a789a35f7a5d 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/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/pkgs/applications/version-management/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index f74ae1cf37a3..213243f1851c 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -10,7 +10,10 @@ , openssl , libusb1 , AppKit +, git , openssh +, testers +, radicle-cli }: rustPlatform.buildRustPackage rec { @@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec { done ''; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ + git + openssh + ]; preCheck = '' eval $(ssh-agent) ''; + passthru.tests = { + version = testers.testVersion { package = radicle-cli; }; + }; + meta = { description = "Command-line tooling for Radicle, a decentralized code collaboration network"; homepage = "https://radicle.xyz"; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index cd4fee219455..ff91d07e87be 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -4,9 +4,11 @@ version = 3 [[package]] name = "abomonation" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" +version = "0.7.3+smallvec1" +source = "git+https://github.com/markbt/abomonation?rev=0f43346d2afa2aedc64d61f3f4273e8d1e454642#0f43346d2afa2aedc64d61f3f4273e8d1e454642" +dependencies = [ + "smallvec", +] [[package]] name = "abomonation_derive" @@ -86,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -148,7 +150,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -165,7 +167,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "num_cpus", "once_cell", "tokio", @@ -173,9 +175,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -448,9 +450,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -470,9 +472,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" dependencies = [ "memchr", "serde", @@ -484,14 +486,14 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -511,9 +513,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -539,6 +541,15 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "camino" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +dependencies = [ + "serde", +] + [[package]] name = "cassowary" version = "0.3.0" @@ -576,9 +587,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -604,7 +615,7 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.25", + "futures 0.3.26", "io", "manifest", "manifest-tree", @@ -688,7 +699,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -773,12 +784,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "quote", ] @@ -822,6 +833,7 @@ version = "0.1.0" dependencies = [ "anyhow", "filetime", + "futures 0.3.26", "hostcaps", "identity", "lazy_static", @@ -829,11 +841,13 @@ dependencies = [ "mime", "regex", "reqwest", + "reqwest-eventsource", "rust-ini", "serde", "serde_json", "tempfile", "thiserror", + "tokio", ] [[package]] @@ -854,9 +868,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils 0.8.14", ] @@ -870,7 +884,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -890,7 +904,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -964,14 +978,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -1039,7 +1053,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "tokio", ] @@ -1384,9 +1398,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" dependencies = [ "cc", "cxxbridge-flags", @@ -1396,9 +1410,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" dependencies = [ "cc", "codespan-reporting", @@ -1411,15 +1425,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ "proc-macro2", "quote", @@ -1439,22 +1453,21 @@ dependencies = [ "drawdag", "fail", "fs2", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "indexmap", - "itertools 0.10.5", "mincode", "minibytes", "nonblocking", "once_cell", "quickcheck", "rand 0.8.5", + "renderdag", "serde", "tempfile", "thiserror", "tokio", "tracing", - "unicode-width", "vlqencoding", ] @@ -1478,7 +1491,6 @@ dependencies = [ "abomonation_derive", "minibytes", "quickcheck", - "quickcheck_arbitrary_derive", "serde", ] @@ -1492,7 +1504,7 @@ dependencies = [ "hashbrown 0.12.3", "lock_api", "once_cell", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", "rayon", "serde", ] @@ -1624,7 +1636,7 @@ dependencies = [ "dag", "edenapi_trait", "fail", - "futures 0.3.25", + "futures 0.3.26", "http", "identity", "manifest-tree", @@ -1663,12 +1675,12 @@ dependencies = [ "async-runtime", "async-trait", "auth", - "bytes 1.3.0", + "bytes 1.4.0", "chrono", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "hg-http", "http-client", "itertools 0.10.5", @@ -1701,7 +1713,7 @@ dependencies = [ "crossbeam 0.8.2", "edenapi", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "minibytes", "tokio", @@ -1717,7 +1729,7 @@ dependencies = [ "async-trait", "configmodel", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "http", "http-client", "minibytes", @@ -1732,7 +1744,7 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "dag-types", "insta_ext", "paste", @@ -1773,9 +1785,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1794,9 +1806,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] @@ -1807,7 +1819,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro2", "quote", "syn", @@ -1875,6 +1887,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom 7.1.3", + "pin-project-lite", +] + [[package]] name = "exchange" version = "0.1.0" @@ -1931,14 +1954,14 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#0b9b58848f96c78f65513457c15292b81dc6b91e" +source = "git+https://github.com/facebook/fb303.git?branch=main#d35b962b6f3dc787ed64c8d6b1b49a986e69f4d0" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -1952,7 +1975,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "fbinit_macros", "quickcheck", @@ -1961,7 +1984,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quote", @@ -1971,14 +1994,15 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#46238c81c2c30ec8e9907203922218e4ecfd4cbb" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5641439382254134d192ca8fe3c9af23f87b5fa" dependencies = [ "anyhow", "async-trait", "base64 0.11.0", "bufsize", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "camino", + "futures 0.3.26", "ghost", "num-derive", "num-traits", @@ -1991,24 +2015,24 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "byteorder", - "bytes 1.3.0", + "bytes 1.4.0", "tokio-util 0.6.10", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tokio-tower", "tokio-util 0.6.10", @@ -2018,7 +2042,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "tokio", ] @@ -2043,7 +2067,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2200,9 +2224,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -2219,16 +2243,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "futures-timer", "pin-utils", ] [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -2236,15 +2260,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -2253,9 +2277,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -2274,9 +2298,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -2285,15 +2309,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -2303,9 +2327,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2405,7 +2429,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "git2", "minibytes", "storemodel", @@ -2425,7 +2449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.1.0", + "bstr 1.2.0", "fnv", "log", "regex", @@ -2437,7 +2461,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", @@ -2485,9 +2509,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2615,7 +2639,7 @@ dependencies = [ "async-trait", "dag", "edenapi", - "futures 0.3.25", + "futures 0.3.26", "gitdag", "metalog", "minibytes", @@ -2669,7 +2693,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "lazy_static", ] @@ -2677,7 +2701,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2700,7 +2724,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "itoa 1.0.5", ] @@ -2711,7 +2735,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "http", "pin-project-lite", ] @@ -2728,7 +2752,7 @@ dependencies = [ "curl", "curl-sys", "env_logger 0.7.1", - "futures 0.3.25", + "futures 0.3.26", "http", "lru-cache", "maplit", @@ -2780,11 +2804,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", @@ -2821,7 +2845,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "hyper", "native-tls", "tokio", @@ -2887,9 +2911,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ "globset", "lazy_static", @@ -3004,12 +3028,12 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3080,9 +3104,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -3140,9 +3164,9 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgit2-sys" -version = "0.13.4+1.4.2" +version = "0.13.5+1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +checksum = "51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba" dependencies = [ "cc", "libc", @@ -3305,7 +3329,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "futures 0.3.25", + "futures 0.3.26", "futures-batch", "manifest", "minibench", @@ -3347,9 +3371,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -3441,7 +3465,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "once_cell", ] @@ -3498,12 +3522,18 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "memmap", "quickcheck", "serde", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -3555,7 +3585,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3645,11 +3675,10 @@ dependencies = [ "bitflags", "dag", "drawdag", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "renderdag", "tempdir", "types", "vlqencoding", @@ -3734,11 +3763,21 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", ] [[package]] @@ -3981,7 +4020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", ] [[package]] @@ -4000,15 +4039,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -4070,9 +4109,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" dependencies = [ "thiserror", "ucd-trie", @@ -4080,9 +4119,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" +checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" dependencies = [ "pest", "pest_generator", @@ -4090,9 +4129,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" +checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" dependencies = [ "pest", "pest_meta", @@ -4103,24 +4142,15 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" +checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" dependencies = [ "once_cell", "pest", "sha2 0.10.6", ] -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - [[package]] name = "phf" version = "0.10.1" @@ -4142,22 +4172,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", + "phf_generator", + "phf_shared 0.11.1", ] [[package]] @@ -4176,22 +4196,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" dependencies = [ - "phf_generator 0.11.1", + "phf_generator", "phf_shared 0.11.1", "proc-macro2", "quote", "syn", ] -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - [[package]] name = "phf_shared" version = "0.10.0" @@ -4314,7 +4325,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4369,9 +4380,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -4524,13 +4535,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.25", + "futures 0.3.26", "hgcommits", "minibytes", "parking_lot 0.11.2", "pyedenapi", "pymetalog", - "renderdag", "storemodel", ] @@ -4599,7 +4609,7 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "progress-model", "pyconfigloader", @@ -4896,7 +4906,7 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "io", "minibytes", "parking_lot 0.11.2", @@ -5075,7 +5085,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quickcheck", @@ -5138,7 +5148,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -5214,15 +5223,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rayon" version = "1.6.1" @@ -5235,9 +5235,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel 0.5.6", "crossbeam-deque 0.8.2", @@ -5340,7 +5340,12 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ + "bitflags", "dag", + "itertools 0.10.5", + "nonblocking", + "serde", + "unicode-width", ] [[package]] @@ -5401,7 +5406,7 @@ version = "0.11.11" source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" dependencies = [ "base64 0.13.1", - "bytes 1.3.0", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", @@ -5440,6 +5445,22 @@ dependencies = [ "winreg", ] +[[package]] +name = "reqwest-eventsource" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom 7.1.3", + "pin-project-lite", + "reqwest", + "thiserror", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -5466,7 +5487,7 @@ dependencies = [ "edenapi", "edenapi_types", "fbinit", - "futures 0.3.25", + "futures 0.3.26", "hex", "hg-http", "hg-metrics", @@ -5613,16 +5634,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.6" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -5685,7 +5706,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5700,6 +5721,7 @@ dependencies = [ "log", "serde", "thiserror", + "tokio", "toml", ] @@ -5727,9 +5749,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5740,9 +5762,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5788,20 +5810,20 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", "byteorder", - "bytes 1.3.0", + "bytes 1.4.0", "serde", "thiserror", ] [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] @@ -5829,9 +5851,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" dependencies = [ "itoa 1.0.5", "ryu", @@ -6037,7 +6059,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6048,7 +6070,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.25", + "futures 0.3.26", "globset", "once_cell", "pathmatcher", @@ -6111,7 +6133,7 @@ dependencies = [ "anyhow", "async-trait", "auto_impl", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "types", ] @@ -6154,7 +6176,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "pin-project 0.4.30", "tokio", ] @@ -6284,9 +6306,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -6308,19 +6330,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "terminfo" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" dependencies = [ - "dirs 2.0.2", + "dirs 4.0.0", "fnv", - "nom", - "phf 0.8.0", + "nom 5.1.2", + "phf 0.11.1", "phf_codegen", ] @@ -6458,7 +6480,7 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -6479,7 +6501,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "thiserror", "thrift", ] @@ -6487,7 +6509,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "clap 2.34.0", @@ -6555,18 +6577,18 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.1" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", - "bytes 1.3.0", + "bytes 1.4.0", "libc", "memchr", "mio 0.8.5", @@ -6577,7 +6599,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6655,10 +6677,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "async-io", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tracing", "uds_windows", @@ -6670,7 +6692,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", @@ -6686,7 +6708,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-sink", "pin-project-lite", @@ -6881,6 +6903,7 @@ dependencies = [ "anyhow", "bitflags", "byteorder", + "fs2", "identity", "itertools 0.10.5", "pretty_assertions", @@ -6889,7 +6912,7 @@ dependencies = [ "rand_chacha 0.3.1", "repolock", "sha2 0.10.6", - "tempdir", + "tempfile", "thiserror", "tracing", "twox-hash", @@ -7028,9 +7051,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -7049,9 +7072,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -7255,9 +7278,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7265,9 +7288,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -7280,9 +7303,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7292,9 +7315,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7302,9 +7325,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -7315,18 +7338,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "futures 0.3.26", "maplit", "serde", "serde_bser", @@ -7338,9 +7361,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -7422,9 +7445,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -7495,6 +7518,30 @@ dependencies = [ "windows_x86_64_msvc", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" @@ -7556,7 +7603,7 @@ dependencies = [ "configmodel", "crossbeam 0.8.2", "edenfs_client", - "futures 0.3.25", + "futures 0.3.26", "identity", "io", "manifest", @@ -7650,9 +7697,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" dependencies = [ "cc", "libc", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 8873e8c4718e..80cc6bf9e936 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU"; + hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE"; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs"; + sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM"; }; # Builds the NodeJS server that runs with `sl web` @@ -88,111 +88,94 @@ let runHook postInstall ''; }; - - # Builds the main `sl` binary and its Python extensions - sapling = python3Packages.buildPythonPackage { - pname = "sapling-main"; - inherit src version; - - sourceRoot = "source/eden/scm"; - - # Upstream does not commit Cargo.lock - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "cloned-0.1.0" = "sha256-DYQTK722wgeDUJtOVXHLt42G6gpe6A62rET+JH+bPKU="; - "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; - "fb303_core-0.0.0" = "sha256-YEFNTYvtgp8nc/1O7AbdyxCD3Xx2xCjbS17fTTEsUL0="; - "fbthrift-0.0.1+unstable" = "sha256-mDoYhXOzQIDqP7XdmiBbmq5VmAKAgggTNH/kW2kHv4k="; - "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; - "serde_bser-0.3.1" = "sha256-/zn1NfXWytXvnalkgPsg9BdujVV97PGkXwmPtQGVeCc="; - }; - }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - # Since the derivation builder doesn't have network access to remain pure, - # fetch the artifacts manually and link them. Then replace the hardcoded URLs - # with filesystem paths for the curl calls. - postUnpack = '' - mkdir $sourceRoot/hack_pydeps - ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} - sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py - ''; - - # Now, copy the "sl web" (aka edenscm-isl) results into the output of this - # package, so that the command can actually work. NOTES: - # - # 1) This applies on all systems (so no conditional a la postFixup) - # 2) This doesn't require any kind of fixup itself, so we leave it out - # of postFixup for that reason, too - # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, - # so that 'sl web' always works - # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB - preFixup = '' - sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - '' + lib.optionalString (!enableMinimal) '' - chmod +w $sitepackages/edenscm-isl/run-isl - substituteInPlace $sitepackages/edenscm-isl/run-isl \ - --replace 'NODE=node' 'NODE=${nodejs}/bin/node' - ''; - - postFixup = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/sl \ - --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" - ''; - - nativeBuildInputs = [ - curl - pkg-config - ] ++ (with rustPlatform; [ - myCargoSetupHook - rust.cargo - rust.rustc - ]); - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - curl - libiconv - CoreFoundation - CoreServices - Security - ]; - - doCheck = false; - - HGNAME = "sl"; - SAPLING_OSS_BUILD = "true"; - SAPLING_VERSION = version; - SAPLING_VERSION_HASH = versionHash; - }; in -stdenv.mkDerivation { +# Builds the main `sl` binary and its Python extensions +python3Packages.buildPythonApplication { pname = "sapling"; - inherit version; + inherit src version; - dontUnpack = true; + sourceRoot = "source/eden/scm"; - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r ${sapling}/* $out - - runHook postInstall + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; + "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I="; + "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; + "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0="; + "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU="; + "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; + "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8="; + }; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock ''; + # Since the derivation builder doesn't have network access to remain pure, + # fetch the artifacts manually and link them. Then replace the hardcoded URLs + # with filesystem paths for the curl calls. + postUnpack = '' + mkdir $sourceRoot/hack_pydeps + ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} + sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py + ''; + + # Now, copy the "sl web" (aka edenscm-isl) results into the output of this + # package, so that the command can actually work. NOTES: + # + # 1) This applies on all systems (so no conditional a la postFixup) + # 2) This doesn't require any kind of fixup itself, so we leave it out + # of postFixup for that reason, too + # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, + # so that 'sl web' always works + # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB + preFixup = '' + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages + chmod +w $sitepackages + cp -r ${isl} $sitepackages/edenscm-isl + '' + lib.optionalString (!enableMinimal) '' + chmod +w $sitepackages/edenscm-isl/run-isl + substituteInPlace $sitepackages/edenscm-isl/run-isl \ + --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/sl \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + ''; + + nativeBuildInputs = [ + curl + pkg-config + ] ++ (with rustPlatform; [ + myCargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + curl + libiconv + CoreFoundation + CoreServices + Security + ]; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = versionHash; + # just a simple check phase, until we have a running test suite. this should # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) doCheck = true; - checkPhase = '' + installCheckPhase = '' echo -n "testing sapling version; should be \"${version}\"... " - ${sapling}/bin/sl version | grep -qw "${version}" + $out/bin/sl version | grep -qw "${version}" echo "OK!" ''; diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 9cbcd71cbcf7..eeedd64b9506 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20221222-152408-ha6a66d09", - "versionHash": "14601963598499040874" + "version": "0.2.20230124-180750-hf8cd450a", + "versionHash": "5465836048527734544" } diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 7faca39e2fe4..9c9f6f403330 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/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/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index cba7be953173..4c6f27b561f8 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; + sha256 = "sha256-gid3zPN9fdUqqNnRKvhEfzO4rJqZ3lWwmlP6SWEUyAY="; }; - cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; + cargoHash = "sha256-UWKD2qXyxGepFK90QkyhyR7PJrK1wUiwQZjApoz9tqU="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 62122bc35b15..2bed38959c13 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2079"; - x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U="; + buildVersion = "2083"; + x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc="; } {}; sublime-merge-dev = common { diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index cfce8a35f9e1..ada5f9fea640 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/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/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 26954375aff5..3d6238463470 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = '' + # https://github.com/CCExtractor/ccextractor/issues/1467 + sed -i '/allheaders.h/a#include ' src/lib_ccx/ocr.c + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' ''; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7c06f6ddb859..bd15099b26ba 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/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/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 3849acda9473..25fac4fba61d 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-hhHWxmr2EzW9QqfV1bpJCiWOWsmGJmvxvtQcuXlMTc4="; + hash = "sha256-kXafPUcWWvadGbcN4PAtXlFmfll/mSpwu2Sbh6Gxx4w="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 4f2b4ef440f7..d6379550e884 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0="; + sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 02c58925558e..b1bf0dac39ba 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; + sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index c2885ba03a0a..f219a3fd1fdf 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,13 +1,18 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "0.1.0+matrix.1"; + version = "unstable-2022-11-28"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + # video search doesn't work for the version on kodi.tv + # if the result contains channels + # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 + src = fetchFromGitHub { + owner = "TheAssassin"; + repo = "kodi-invidious-plugin"; + rev = "85b66525632d94630c9301d9c490fc002a335d77"; + hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; }; propagatedBuildInputs = [ @@ -18,9 +23,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.invidious"; - }; }; meta = with lib; { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d083f1eda20a..110c48c1e4ab 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/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/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index d0d52ade25ad..bc3603922475 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -39,6 +39,9 @@ stdenvNoCC.mkDerivation rec { yarnLock = ./yarn.lock; packageJSON = ./package.json; + # workaround for https://github.com/webpack/webpack/issues/14532 + NODE_OPTIONS = "--openssl-legacy-provider"; + patches = [ # NOTE: fixes for hardcoded paths and assumptions about filesystem # permissions @@ -86,8 +89,9 @@ stdenvNoCC.mkDerivation rec { yarn2nix; }; - meta = { + meta = with lib; { inherit (mirakurun.meta) description platforms; - maintainers = with lib.maintainers; [ midchildan ]; + license = licenses.asl20; + maintainers = with maintainers; [ midchildan ]; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9f91cc0c3c08..372bc52044e7 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "mpc-qt"; - version = "22.02"; + version = "23.02"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "sha256-DRbNDrWnaTT4A0dRFAv9MX/MDwV/rXIw+R8fQJmVN+g="; + sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk="; }; nativeBuildInputs = [ pkg-config qmake qttools ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fa6167b9c118..2ac85084b413 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "29.0.0"; + version = "29.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y="; + sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 7a8e19325090..499f07fccd7a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/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/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index ba0e8a818263..c156ac288b66 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -8,6 +8,7 @@ , wayland-scanner , obs-studio , libX11 +, libxcb , vulkan-headers , vulkan-loader , libGL @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL libX11 + libxcb vulkan-headers vulkan-loader wayland diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 02270cd75e06..ec980f1bfd1b 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -7,6 +7,7 @@ , gtk3 , libopenshot , python3 +, qtbase , qtsvg , wrapGAppsHook }: @@ -55,7 +56,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { '' # Fix toolbar icons on Darwin + lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 4214bed7167f..904f039758ca 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt - export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ @@ -62,7 +60,10 @@ stdenv.mkDerivation rec { doCheck = false; - cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; + cmakeFlags = [ + "-DENABLE_RUBY=OFF" + "-DPYTHON_MODULE_PATH=${python3.sitePackages}" + ]; meta = with lib; { homepage = "http://openshot.org/"; diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix new file mode 100644 index 000000000000..a7bdf2e110fb --- /dev/null +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, fetchzip +, ffmpeg +, gtk2 +, hunspell +, icoutils +, mono +, mpv +, tesseract4 +}: + +stdenv.mkDerivation rec { + pname = "subtitleedit"; + version = "3.6.11"; + + src = fetchzip { + url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; + sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26"; + stripRoot = false; + }; + + preUnpack = '' + rm -rf source + ''; + + nativeBuildInputs = [ + copyDesktopItems + icoutils + makeWrapper + ]; + + runtimeLibs = lib.makeLibraryPath [ + gtk2 + hunspell + mpv + tesseract4 + ]; + + runtimeBins = lib.makeBinPath [ + ffmpeg + hunspell + tesseract4 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps + + cp -r * $out/bin/ + ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so + makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \ + --add-flags "$out/bin/SubtitleEdit.exe" \ + --prefix LD_LIBRARY_PATH : ${runtimeLibs} \ + --prefix PATH : ${runtimeBins} + + wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico + icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Subtitle Edit"; + exec = "subtitleedit"; + icon = "subtitleedit"; + comment = meta.description; + categories = [ "Video" ]; + }) + ]; + + meta = with lib; { + description = "A subtitle editor"; + homepage = "https://nikse.dk/subtitleedit/"; + license = licenses.gpl3Plus; + longDescription = '' + With Subtitle Edit you can easily adjust a subtitle if it is out of sync with + the video in several different ways. You can also use it for making + new subtitles from scratch (using the time-line /waveform/spectrogram) + or for translating subtitles. + ''; + maintainers = with maintainers; [ paveloom ]; + platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 28528318c162..404af2ec83b3 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub +{ lib, stdenv, vdr, fetchFromGitHub , graphicsmagick, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${vdr.version}-${name}"; + name = "vdr-${name}-${vdr.version}"; inherit (vdr) src; buildInputs = [ vdr ]; preConfigure = "cd PLUGINS/src/${name}"; @@ -55,13 +55,13 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.26"; + version = "3.1.1"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; - rev = "v${version}"; + sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; + rev = "V${version}"; }; buildInputs = [ vdr ffmpeg ]; @@ -101,12 +101,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { repo = "vdr-plugin-epgsearch"; owner = "vdr-projects"; - sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; + sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; rev = "v${version}"; }; @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.1"; + version = "1.8.3"; buildInputs = [ vdr ]; @@ -160,7 +160,7 @@ in { repo = "vdr-plugin-vnsiserver"; owner = "vdr-projects"; rev = version; - sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; + sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE="; }; meta = with lib; { @@ -173,14 +173,15 @@ in { }; - text2skin = stdenv.mkDerivation { + text2skin = stdenv.mkDerivation rec { pname = "vdr-text2skin"; version = "1.3.4-20170702"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; - sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; + src = fetchFromGitHub { + repo = "vdr-plugin-text2skin"; + owner = "vdr-projects"; rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad"; + sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; }; buildInputs = [ vdr graphicsmagick ]; @@ -200,7 +201,7 @@ in { dontInstall = true; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; + inherit (src.meta) homepage; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index f31e7b79ae7d..ed9c09087e41 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.3"; + version = "1.9.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM="; + sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f177..e49c2a659121 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/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/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 25b89889b528..16fdd0317d5f 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/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/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index d95b37ef1d30..6e6a6434ed80 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.16"; + version = "1.6.18"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-p2I188MGoxnd7dBAMQ0bM5+GT8z3y9S4cZW2Q99DyzY="; + hash = "sha256-ApQKdd+S02YFNDVrrSKVHZmR1ZQwcU1KoQRfhOP9VHQ="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1646c0517514..cada624a2a68 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; + sha256 = "sha256-/kdEzC97atFJw8rWFAdm9tofayj1fwBRvNKwbjWIGR8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; + vendorHash = "sha256-1iEJPVrsRqQQhkspRmUtS4ru4DCKiyobGztM4d0vb2Y="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch new file mode 100644 index 000000000000..85806bfcd892 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index d5c3627..2bd692a 100644 +--- a/meson.build ++++ b/meson.build +@@ -86,7 +86,7 @@ govirt_global_cflags = ['-std=c99', + '-Woverride-init', + '-Wno-unused-parameter'] + +-foreach arg : govirt_global_cflags ++foreach arg : compiler.get_supported_arguments(govirt_global_cflags) + add_project_arguments(arg, language : 'c') + endforeach diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 0815781c21f7..c93f8a689730 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -1,46 +1,48 @@ { lib , stdenv -, fetchurl -, glib +, fetchzip , gnome -, librest -, libsoup +, meson , pkg-config , gobject-introspection +, ninja +, glib +, librest_1_0 }: stdenv.mkDerivation rec { pname = "libgovirt"; - version = "0.3.8"; + version = "0.3.9"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = fetchzip { url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk="; }; - patches = lib.optionals stdenv.isDarwin [ - # The flag breaks the build on darwin and doesn't seem necessary - ./no-version-script-ld-flag.patch + patches = [ + # https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9 + ./auto-disable-incompatible-compiler-warnings.patch ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (lib.concatStringsSep " " [ + "-Wno-typedef-redefinition" + "-Wno-missing-field-initializers" + "-Wno-cast-align" + ]); nativeBuildInputs = [ + meson pkg-config gobject-introspection - ]; - - buildInputs = [ - libsoup + ninja ]; propagatedBuildInputs = [ glib - librest + librest_1_0 ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch deleted file mode 100644 index a837c3bf0642..000000000000 --- a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/govirt/Makefile.in -+++ b/govirt/Makefile.in -@@ -511,8 +511,7 @@ - libgovirt_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ -- -no-undefined \ -- -Wl,--version-script=$(srcdir)/govirt.sym -+ -no-undefined - - libgovirt_la_CFLAGS = \ - $(WARNINGFLAGS_C) - -Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index c41779459454..6631ff63ea20 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/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/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f6cc83fde17c..d8bfa140fa87 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,17 +14,19 @@ , go-md2man , nixosTests , python3 +, testers +, podman }: 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 +34,7 @@ buildGoModule rec { ./rm-podman-mac-helper-msg.patch ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; @@ -87,6 +89,11 @@ buildGoModule rec { ''; passthru.tests = { + version = testers.testVersion { + package = podman; + command = "HOME=$TMPDIR podman --version"; + }; + } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 902a50e4ce24..d1fe9bcc9b0a 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/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/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 604000434be5..648183654701 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/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/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e68cf7048b56..c20a2c53d600 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo @@ -51,7 +51,13 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ] + nativeBuildInputs = [ + makeWrapper removeReferencesTo + pkg-config flex bison meson ninja perl + + # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation + python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme + ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -143,7 +149,6 @@ stdenv.mkDerivation rec { # have our patches and will be subtly broken because of that. "--meson=meson" "--cross-prefix=${stdenv.cc.targetPrefix}" - "--cpu=${stdenv.hostPlatform.uname.processor}" (lib.enableFeature guestAgentSupport "guest-agent") ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix new file mode 100644 index 000000000000..b952b0f18918 --- /dev/null +++ b/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/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix deleted file mode 100644 index 5ec5b19ce042..000000000000 --- a/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/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix new file mode 100644 index 000000000000..562781b09a31 --- /dev/null +++ b/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/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix new file mode 100644 index 000000000000..aa626443c538 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -0,0 +1,92 @@ +{ callPackage +, fetchFromGitHub +, nixos +, conmon +}: +let + apptainer = callPackage + (import ./generic.nix rec { + pname = "apptainer"; + version = "1.1.5"; + projectName = "apptainer"; + + src = fetchFromGitHub { + owner = "apptainer"; + repo = "apptainer"; + rev = "v${version}"; + hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic="; + }; + + # 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/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2e8aa34286a6..0e24dd9b08f2 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -3,14 +3,20 @@ , bash-completion , fetchurl , fetchpatch -, gdbm ? null +, gdbm , glib , gsettings-desktop-schemas , gtk-vnc , gtk3 , intltool -, libcap ? null +, libcap , libgovirt + # Currently unsupported. According to upstream, libgovirt is for a very narrow + # use-case and we don't currently cover it in Nixpkgs. It's safe to disable. + # https://gitlab.com/virt-viewer/virt-viewer/-/issues/100#note_1265011223 + # Can be enabled again once this is merged: + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/129 +, ovirtSupport ? false , libvirt , libvirt-glib , libxml2 @@ -19,21 +25,13 @@ , pkg-config , python3 , shared-mime-info -# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 -, spice-gtk_libsoup2 ? null -, spice-protocol ? null +, spice-gtk +, spice-protocol , spiceSupport ? true , vte , wrapGAppsHook }: -assert spiceSupport -> ( - gdbm != null - && (stdenv.isLinux -> libcap != null) - && spice-gtk_libsoup2 != null - && spice-protocol != null -); - with lib; stdenv.mkDerivation rec { @@ -46,10 +44,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 0.61 - # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117 + # Fix build with meson 0.61. Should be fixed in the next release. + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/120 (fetchpatch { - url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch"; + url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/98d9f202ef768f22ae21b5c43a080a1aa64a7107.patch"; sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o="; }) ]; @@ -71,21 +69,26 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk-vnc gtk3 - libgovirt libvirt libvirt-glib libxml2 vte + ] ++ optionals ovirtSupport [ + libgovirt ] ++ optionals spiceSupport ([ gdbm - spice-gtk_libsoup2 + spice-gtk spice-protocol ] ++ optionals stdenv.isLinux [ libcap ]); # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + + mesonFlags = [ + (lib.mesonEnable "ovirt" ovirtSupport) + ]; strictDeps = true; diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix index 5347b0961a54..6e483a40ef51 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/applications/window-managers/cardboard/default.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation rec { cp -r ${expected-wrap} ${expected-wrap.name} cp -r ${wlroots-wrap} ${wlroots-wrap.name} ) + + sed '1i#include ' -i cardboard/ViewAnimation.h # gcc12 ''; # "Inherited" from Nixpkgs expression for wlroots @@ -108,6 +110,8 @@ stdenv.mkDerivation rec { "-Dwlroots:libseat=disabled" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; # gcc12 + meta = with lib; { homepage = "https://gitlab.com/cardboardwm/cardboard"; description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 251092049c9a..6e2e45e8b9a6 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation (self: { preBuild = '' makeFlagsArray+=( - XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""} - XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""} + XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"} + XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"} ) ''; diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index 61a82f526d9e..4c75b082506d 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -7,14 +7,14 @@ , pkg-config }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "katriawm"; - version = "21.09"; + version = "22.12"; src = fetchzip { - name = finalAttrs.pname + "-" + finalAttrs.version; - url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8="; + name = self.pname + "-" + self.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz"; + hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc="; }; nativeBuildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "prefix=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; description = "A non-reparenting, dynamic window manager with decorations"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e86af9dad573..439030f34da3 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-noZ2vo4J0cG3PN2k+2LzMc5WMtj0FEmMttE9obFH/tM="; + hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6cfc55240222..32c8cf1b86a3 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; }; patches = [ diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 30e43fa0c902..20a7a5ed7fe0 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = version; - hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; + rev = "v${version}"; + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; }; strictDeps = true; diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index fed0f6cb3441..c785e6196db1 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -20,7 +20,11 @@ let nativeBuildInputs = [ makeWrapper ]; passthru = { unwrapped = Agda; - tests = { inherit (nixosTests) agda; }; + inherit withPackages; + tests = { + inherit (nixosTests) agda; + allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self)); + }; }; inherit (Agda) meta; } '' diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 7186675a5c62..fec2d0526bb3 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -83,12 +83,12 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' +'' else lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool \ -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libblas${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" @@ -115,12 +115,12 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' +'' else lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -id $out/lib/libcblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libcblas${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" fi diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 80fb7be8c1e1..9886a035e4ec 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation { cp -L "$liblapack" $out/lib/liblapack${canonicalExtension} chmod +w $out/lib/liblapack${canonicalExtension} -'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' +'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" @@ -83,10 +83,10 @@ EOF cp -L "$liblapacke" $out/lib/liblapacke${canonicalExtension} chmod +w $out/lib/liblapacke${canonicalExtension} -'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' +'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension} -'' else "") + '' +'') + '' if [ -f "$out/lib/liblapacke.so.3" ]; then ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so diff --git a/pkgs/build-support/binary-cache/default.nix b/pkgs/build-support/binary-cache/default.nix new file mode 100644 index 000000000000..577328cad920 --- /dev/null +++ b/pkgs/build-support/binary-cache/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPackages }: + +# This function is for creating a flat-file binary cache, i.e. the kind created by +# nix copy --to file:///some/path and usable as a substituter (with the file:// prefix). + +# For example, in the Nixpkgs repo: +# nix-build -E 'with import ./. {}; mkBinaryCache { rootPaths = [hello]; }' + +{ name ? "binary-cache" +, rootPaths +}: + +stdenv.mkDerivation { + inherit name; + + __structuredAttrs = true; + + exportReferencesGraph.closure = rootPaths; + + preferLocalBuild = true; + + PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin:${buildPackages.python3}/bin:${buildPackages.nix}/bin:${buildPackages.xz}/bin"; + + builder = builtins.toFile "builder" '' + . .attrs.sh + + export out=''${outputs[out]} + + mkdir $out + mkdir $out/nar + + python ${./make-binary-cache.py} + + # These directories must exist, or Nix might try to create them in LocalBinaryCacheStore::init(), + # which fails if mounted read-only + mkdir $out/realisations + mkdir $out/debuginfo + mkdir $out/log + ''; +} diff --git a/pkgs/build-support/binary-cache/make-binary-cache.py b/pkgs/build-support/binary-cache/make-binary-cache.py new file mode 100644 index 000000000000..16dd8a7e96bc --- /dev/null +++ b/pkgs/build-support/binary-cache/make-binary-cache.py @@ -0,0 +1,43 @@ + +import json +import os +import subprocess + +with open(".attrs.json", "r") as f: + closures = json.load(f)["closure"] + +os.chdir(os.environ["out"]) + +nixPrefix = os.environ["NIX_STORE"] # Usually /nix/store + +with open("nix-cache-info", "w") as f: + f.write("StoreDir: " + nixPrefix + "\n") + +def dropPrefix(path): + return path[len(nixPrefix + "/"):] + +for item in closures: + narInfoHash = dropPrefix(item["path"]).split("-")[0] + + xzFile = "nar/" + narInfoHash + ".nar.xz" + with open(xzFile, "w") as f: + subprocess.run("nix-store --dump %s | xz -c" % item["path"], stdout=f, shell=True) + + fileHash = subprocess.run(["nix-hash", "--base32", "--type", "sha256", item["path"]], capture_output=True).stdout.decode().strip() + fileSize = os.path.getsize(xzFile) + + # Rename the .nar.xz file to its own hash to match "nix copy" behavior + finalXzFile = "nar/" + fileHash + ".nar.xz" + os.rename(xzFile, finalXzFile) + + with open(narInfoHash + ".narinfo", "w") as f: + f.writelines((x + "\n" for x in [ + "StorePath: " + item["path"], + "URL: " + finalXzFile, + "Compression: xz", + "FileHash: sha256:" + fileHash, + "FileSize: " + str(fileSize), + "NarHash: " + item["narHash"], + "NarSize: " + str(item["narSize"]), + "References: " + " ".join(dropPrefix(ref) for ref in item["references"]), + ])) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 45ae3eba9b44..6e33f6189a4a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -92,9 +92,8 @@ let else ""; expand-response-params = - if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" - then import ../expand-response-params { inherit (buildPackages) stdenv; } - else ""; + lib.optionalString (buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null") + (import ../expand-response-params { inherit (buildPackages) stdenv; }); in diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index d1cd502e7e4b..a3f331b23cb8 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -118,10 +118,10 @@ stdenv.mkDerivation (fBuildAttrs // { # Remove all built in external workspaces, Bazel will recreate them when building rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} - ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} + ${lib.optionalString removeRulesCC "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}"} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} + ${lib.optionalString removeLocalConfigCc "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}"} + ${lib.optionalString removeLocal "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}"} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index c539d671e983..048233d728c4 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/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" @@ -139,6 +137,18 @@ let fi done + declare -a x11_args + # Always mount a tmpfs on /tmp/.X11-unix + # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 + x11_args+=(--tmpfs /tmp/.X11-unix) + + # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. + if [[ "$DISPLAY" == :* ]]; then + display_nr=''${DISPLAY#?} + local_socket=/tmp/.X11-unix/X$display_nr + x11_args+=(--ro-bind-try "$local_socket" "$local_socket") + fi + cmd=( ${bubblewrap}/bin/bwrap --dev-bind /dev /dev @@ -173,6 +183,7 @@ let "''${ro_mounts[@]}" "''${symlinks[@]}" "''${auto_mounts[@]}" + "''${x11_args[@]}" ${concatStringsSep "\n " extraBwrapArgs} ${init runScript}/bin/${name}-init ${initArgs} ) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 7ebcba73708c..c4d967a11c69 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -212,7 +212,7 @@ in stdenv.mkDerivation { cd $out ${extraBuildCommands} cd $out - ${if isMultiBuild then extraBuildCommandsMulti else ""} + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} ''; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 09457caecb86..fbc50c2dc253 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: +{ stdenv, lib, buildEnv, writeText, pkgs, pkgsi686Linux }: { name , profile ? "" @@ -237,7 +237,7 @@ in stdenv.mkDerivation { cd $out ${extraBuildCommands} cd $out - ${if isMultiBuild then extraBuildCommandsMulti else ""} + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} ''; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index f223009cba5c..3bf675b5d208 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, graalvm, glibcLocales }: - -{ name ? "${args.pname}-${args.version}" - # Final executable name +{ lib +, stdenv +, glibcLocales + # The GraalVM derivation to use +, graalvmDrv +, name ? "${args.pname}-${args.version}" , executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src @@ -9,8 +11,6 @@ # Default native-image arguments. You probably don't want to set this, # 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" @@ -19,16 +19,25 @@ , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # The GraalVM derivation to use -, graalvmDrv ? graalvm # Locale to be used by GraalVM compiler , LC_ALL ? "en_US.UTF-8" , meta ? { } , ... } @ args: -stdenv.mkDerivation (args // { - inherit dontUnpack LC_ALL; +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "glibcLocales" + "jar" + "dontUnpack" + "LC_ALL" + "meta" + ]; +in +stdenv.mkDerivation ({ + inherit dontUnpack LC_ALL jar; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; @@ -37,7 +46,7 @@ stdenv.mkDerivation (args // { buildPhase = args.buildPhase or '' runHook preBuild - native-image ''${nativeImageBuildArgs[@]} + native-image -jar "$jar" ''${nativeImageBuildArgs[@]} runHook postBuild ''; @@ -50,12 +59,16 @@ stdenv.mkDerivation (args // { runHook postInstall ''; + disallowedReferences = [ graalvmDrv ]; + + passthru = { inherit graalvmDrv; }; + meta = { # default to graalvm's platforms platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; # need to have native-image-installable-svm available - broken = !(builtins.elem "native-image-installable-svm" graalvmDrv.products); + broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; -}) +} // extraArgs) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e..5737989249af 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,8 +6,8 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true }: let +lib: pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true}: let build = if application then pythonPackages.buildPythonApplication else pythonPackages.buildPythonPackage; @@ -18,7 +18,8 @@ in build { nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ - (if doCheck then (info.tests_require or []) else [])); + (lib.optionals doCheck (info.tests_require or [])) + ); propagatedBuildInputs = map (p: pythonPackages.${p}) (info.install_requires or []); diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 33df804d5efe..6520c04f5e8a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -59,9 +59,7 @@ let suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null" - then import ../expand-response-params { inherit (buildPackages) stdenv; } - else ""; + lib.optionalString ((buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; }); useGccForLibs = isClang && libcxx == null @@ -343,18 +341,11 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - # - # We use --sysroot=/nix/store/does/not/exist to drop embedded default - # path to glibc headers gcc was built against. Without it -idirafter - # only appends to the list and outdated glibc headers end up being - # used. 'cc-cflags-before' is used to allow user's --sysroot= option - # to override our default. + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' - echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index 8dc77f3aac03..ea1c5328082d 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -30,9 +30,7 @@ let meta.licence = let depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); in (lib.flatten (lib.forEach depLicenses (spdx: - if (spdx != "") - then lib.getLicenseFromSpdxId spdx - else [] + lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) ))); }; in nuget-source diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index 6d084d3c77ed..da1984832684 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -35,4 +35,4 @@ let ({prefix, path}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in - if (pathParts != []) then (builtins.head pathParts).path else "" + lib.optionalString (pathParts != []) ((builtins.head pathParts).path) diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 3a4876bc5de3..7866c403ec42 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -1,9 +1,9 @@ -{stdenv, fossil, cacert}: +{stdenv, lib, fossil, cacert}: {name ? null, url, rev, sha256}: stdenv.mkDerivation { - name = "fossil-archive" + (if name != null then "-${name}" else ""); + name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; nativeBuildInputs = [fossil cacert]; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 2d0b4b20ef8b..56973f5d3678 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -7,9 +7,7 @@ short = builtins.substring 0 7 rev; - appendShort = if (builtins.match "[a-f0-9]*" rev) != null - then "-${short}" - else ""; + appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${short}"; in "${if matched == null then base else builtins.head matched}${appendShort}"; in { url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 15309d0a1950..b3c28fb0e264 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -12,13 +12,13 @@ if md5 != null then else # TODO: statically check if mercurial as the https support if the url starts woth https. stdenvNoCC.mkDerivation { - name = "hg-archive" + (if name != null then "-${name}" else ""); + name = "hg-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; nativeBuildInputs = [mercurial]; impureEnvVars = lib.fetchers.proxyImpureEnvVars; - subrepoClause = if fetchSubrepos then "S" else ""; + subrepoClause = lib.optionalString fetchSubrepos "S"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index efdbd0decf95..b1d8593e72d4 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/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/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 3ebe797f736d..d059715cedc1 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -18,7 +18,7 @@ let args' = if relative != null then { stripLen = 1 + lib.length (lib.splitString "/" relative) + stripLen; - extraPrefix = if extraPrefix != null then extraPrefix else ""; + extraPrefix = lib.optionalString (extraPrefix != null) extraPrefix; } else { inherit stripLen extraPrefix; }; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 448143f76908..284cc1586dad 100644 --- a/pkgs/build-support/go/module.nix +++ b/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/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index b5eb21e5ba4b..6e2de7fa11b0 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -46,14 +46,14 @@ else stdenv.mkDerivation rec { -L${llvmPackages_13.clang.libc}/lib \ -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ - -ldl -shared -o "$libName" + -shared -o "$libName" '' else if stdenv.isDarwin then '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ -Wl,-install_name,$out/lib/$libName \ - -ldl -shared -o "$libName" + -shared -o "$libName" '' else '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ - -ldl -shared -o "$libName" + -shared -o "$libName" ''} if [ -n "$doInstallCheck" ]; then diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 1222d2ee75c6..9ecc16450cc2 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -201,6 +201,37 @@ WRAPPER(int, __xstat64)(int ver, const char * path, struct stat64 * st) WRAPPER_DEF(__xstat64) #endif +#if defined(__linux__) && defined(STATX_TYPE) +WRAPPER(int, statx)(int dirfd, const char * restrict pathname, int flags, + unsigned int mask, struct statx * restrict statxbuf) +{ + int (*statx_real) (int, const char * restrict, int, + unsigned int, struct statx * restrict) = LOOKUP_REAL(statx); + char buf[PATH_MAX]; + return statx_real(dirfd, rewrite(pathname, buf), flags, mask, statxbuf); +} +WRAPPER_DEF(statx) +#endif + +WRAPPER(int, fstatat)(int dirfd, const char * pathname, struct stat * statbuf, int flags) +{ + int (*fstatat_real) (int, const char *, struct stat *, int) = LOOKUP_REAL(fstatat); + char buf[PATH_MAX]; + return fstatat_real(dirfd, rewrite(pathname, buf), statbuf, flags); +} +WRAPPER_DEF(fstatat); + +// In musl libc, fstatat64 is simply a macro for fstatat +#if !defined(__APPLE__) && !defined(fstatat64) +WRAPPER(int, fstatat64)(int dirfd, const char * pathname, struct stat64 * statbuf, int flags) +{ + int (*fstatat64_real) (int, const char *, struct stat64 *, int) = LOOKUP_REAL(fstatat64); + char buf[PATH_MAX]; + return fstatat64_real(dirfd, rewrite(pathname, buf), statbuf, flags); +} +WRAPPER_DEF(fstatat64); +#endif + WRAPPER(int, stat)(const char * path, struct stat * st) { int (*__stat_real) (const char *, struct stat *) = LOOKUP_REAL(stat); @@ -209,6 +240,17 @@ WRAPPER(int, stat)(const char * path, struct stat * st) } WRAPPER_DEF(stat) +// In musl libc, stat64 is simply a macro for stat +#if !defined(__APPLE__) && !defined(stat64) +WRAPPER(int, stat64)(const char * path, struct stat64 * st) +{ + int (*stat64_real) (const char *, struct stat64 *) = LOOKUP_REAL(stat64); + char buf[PATH_MAX]; + return stat64_real(rewrite(path, buf), st); +} +WRAPPER_DEF(stat64) +#endif + WRAPPER(int, access)(const char * path, int mode) { int (*access_real) (const char *, int mode) = LOOKUP_REAL(access); @@ -346,6 +388,14 @@ WRAPPER(int, system)(const char *command) } WRAPPER_DEF(system) +WRAPPER(int, chdir)(const char *path) +{ + int (*chdir_real) (const char *) = LOOKUP_REAL(chdir); + char buf[PATH_MAX]; + return chdir_real(rewrite(path, buf)); +} +WRAPPER_DEF(chdir); + WRAPPER(int, mkdir)(const char *path, mode_t mode) { int (*mkdir_real) (const char *path, mode_t mode) = LOOKUP_REAL(mkdir); diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index 144e6d3d66dd..7dd384ae3ed7 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -63,6 +63,12 @@ int main(int argc, char *argv[]) FILE *testfp; int testfd; struct stat testsb; +#ifndef __APPLE__ + struct stat64 testsb64; +#endif +#if defined(__linux__) && defined(STATX_TYPE) + struct statx testsbx; +#endif char buf[PATH_MAX]; testfp = fopen(TESTPATH, "r"); @@ -76,6 +82,20 @@ int main(int argc, char *argv[]) assert(access(TESTPATH, X_OK) == 0); assert(stat(TESTPATH, &testsb) != -1); +#ifndef __APPLE__ + assert(stat64(TESTPATH, &testsb64) != -1); +#endif + assert(fstatat(123, TESTPATH, &testsb, 0) != -1); +#ifndef __APPLE__ + assert(fstatat64(123, TESTPATH, &testsb64, 0) != -1); +#endif +#if defined(__linux__) && defined(STATX_TYPE) + assert(statx(123, TESTPATH, 0, STATX_ALL, &testsbx) != -1); +#endif + + assert(getcwd(buf, PATH_MAX) != NULL); + assert(chdir(TESTDIR) == 0); + assert(chdir(buf) == 0); assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0); assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory! diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index c2dfe27b2c60..8f02c559238e 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -36,6 +36,6 @@ stdenvNoCC.mkDerivation { inherit perl; inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); - signingUtils = if darwinCodeSign then signingUtils else ""; + signingUtils = lib.optionalString darwinCodeSign signingUtils; }; } diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index 1aa14cfeb7cc..1d43c8e162ab 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -12,7 +12,7 @@ if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi -set -- "$@" @addFlags@ +set -- @addFlags@ "$@" if (( ${#role_suffixes[@]} > 0 )); then # replace env var with nix-modified one diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 168343c80821..24d5b2e1cafc 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -10,7 +10,7 @@ directory, so the Makefile of the package should support DESTDIR. */ -{ src, stdenv +{ src, lib, stdenv , name ? "binary-tarball" , ... } @ args: @@ -30,7 +30,7 @@ stdenv.mkDerivation ( // args // { - name = name + (if src ? version then "-" + src.version else ""); + name = name + (lib.optionalString (src ? version) "-${src.version}"); postHook = '' mkdir -p $out/nix-support diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 679adad827da..6e08caf0a4e5 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -24,7 +24,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( // removeAttrs args ["vmTools" "lib"] // { - name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}"); # !!! cut&paste from rpm-build.nix postHook = '' diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index da1078369a58..ee414ea3280d 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -11,7 +11,7 @@ rec { makeSourceTarball = sourceTarball; # compatibility binaryTarball = args: import ./binary-tarball.nix ( - { inherit stdenv; + { inherit lib stdenv; } // args); mvnBuild = args: import ./maven-build.nix ( @@ -38,7 +38,7 @@ rec { } // args); rpmBuild = args: import ./rpm-build.nix ( - { inherit vmTools; + { inherit lib vmTools; } // args); debBuild = args: import ./debian-build.nix ( diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index daee44b85acc..f618032724c9 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation ( { inherit name src; - phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; + phases = "setupPhase unpackPhase patchPhase mvnCompile ${lib.optionalString doTestCompile "mvnTestCompile mvnTestJar"} ${lib.optionalString doTest "mvnTest"} ${lib.optionalString doJavadoc "mvnJavadoc"} ${lib.optionalString doCheckstyle "mvnCheckstyle"} mvnJar mvnAssembly mvnRelease finalPhase"; setupPhase = '' runHook preSetupPhase @@ -88,9 +88,9 @@ stdenv.mkDerivation ( { echo "$releaseName" > $out/nix-support/hydra-release-name - ${if doRelease then '' + ${lib.optionalString doRelease '' echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products - '' else ""} + ''} ''; finalPhase = '' diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 9578fbf482f2..0498232d4d62 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation ( // removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string // { - name = name + (if src ? version then "-" + src.version else ""); + name = name + (lib.optionalString (src ? version) "-${src.version}"); postHook = '' . ${./functions.sh} @@ -167,7 +167,7 @@ stdenv.mkDerivation ( echo "building out of source tree, from \`$PWD'..." - ${if preConfigure != null then preConfigure else ""} + ${lib.optionalString (preConfigure != null) preConfigure} ''; } else {}) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 47c01f2e66b2..8f4711470509 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -3,7 +3,7 @@ { name ? "rpm-build" , diskImage -, src, vmTools +, src, lib, vmTools , ... } @ args: vmTools.buildRPM ( @@ -11,7 +11,7 @@ vmTools.buildRPM ( removeAttrs args ["vmTools"] // { - name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}"); preBuild = '' . ${./functions.sh} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 98030225bcbb..435a942daa26 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -299,7 +299,7 @@ crate_: lib.makeOverridable ); libName = if crate ? libName then crate.libName else crate.crateName; - libPath = if crate ? libPath then crate.libPath else ""; + libPath = lib.optionalString (crate ? libPath) crate.libPath; # Seed the symbol hashes with something unique every time. # https://doc.rust-lang.org/1.0.0/rustc/metadata/loader/index.html#frobbing-symbols diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 69ee4f56b98f..b057d1681b03 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -4,7 +4,6 @@ , rust , stdenv , callPackage -, cacert , cargoBuildHook , cargoCheckHook , cargoInstallHook @@ -124,7 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg inherit cargo cargo-auditable; }) ] ++ [ - cacert cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 7ca306b613bc..36ab93169741 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -73,6 +73,9 @@ in stdenv.mkDerivation ({ ${cargoUpdateHook} + # Override the `http.cainfo` option usually specified in `.cargo/config`. + export CARGO_HTTP_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt + cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG # Create an empty vendor directory when there is no dependency to vendor diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 13562acd5492..9989e582d2e9 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/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/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 77397f9b7220..aa5ba14c1397 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -30,10 +30,17 @@ rec { else lib.optional platform.isUnix "unix" ++ lib.optional platform.isWindows "windows"; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + toTargetVendor = platform: let + inherit (platform.parsed) vendor; + in platform.rustc.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + # Returns the name of the rust target, even if it is custom. Adjustments are # because rust has slightly different naming conventions than we do. toRustTarget = platform: let - inherit (platform.parsed) cpu vendor kernel abi; + inherit (platform.parsed) cpu kernel abi; cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; @@ -41,9 +48,7 @@ rec { "armv5tel" = "armv5te"; "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; - vendor_ = platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; + vendor_ = toTargetVendor platform; in platform.rustc.config or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index f34353a7617b..b07b0c5ae804 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,4 +1,6 @@ -postFixupHooks+=(_makeSymlinksRelative) +# symlinks are often created in postFixup +# don't use fixupOutputHooks, it is before postFixup +postFixupHooks+=(_makeSymlinksRelativeInAllOutputs) # For every symlink in $output that refers to another file in $output # ensure that the symlink is relative. This removes references to the output @@ -26,3 +28,10 @@ _makeSymlinksRelative() { done < <(find $prefix -type l -print0) } + +_makeSymlinksRelativeInAllOutputs() { + local output + for output in $(getAllOutputNames); do + prefix="${!output}" _makeSymlinksRelative + done +} diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 46df792bdf6c..9689e4124590 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/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/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 15694162edde..542133dd959a 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -123,4 +123,5 @@ hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { }; } diff --git a/pkgs/build-support/testers/testMetaPkgConfig/tester.nix b/pkgs/build-support/testers/testMetaPkgConfig/tester.nix new file mode 100644 index 000000000000..bee97ace1409 --- /dev/null +++ b/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/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index d8aa6c232444..7318d13f6bab 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/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/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 84754e580302..403bc9b1d2da 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -35,10 +35,12 @@ rec { mkdir -p $out/lib # Copy what we need from Glibc. - cp -p ${pkgs.stdenv.cc.libc}/lib/ld-linux*.so.? $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libc.so.* $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libm.so.* $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* $out/lib + cp -p \ + ${pkgs.stdenv.cc.libc}/lib/ld-*.so.? \ + ${pkgs.stdenv.cc.libc}/lib/libc.so.* \ + ${pkgs.stdenv.cc.libc}/lib/libm.so.* \ + ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \ + $out/lib # Copy BusyBox. cp -pd ${pkgs.busybox}/bin/* $out/bin @@ -49,7 +51,7 @@ rec { for i in $out/bin/*; do if [ -f "$i" -a ! -L "$i" ]; then echo "patching $i..." - patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true fi done ''; # */ @@ -406,7 +408,7 @@ rec { eval "$origPostHook" ''; - origPostHook = if attrs ? postHook then attrs.postHook else ""; + origPostHook = lib.optionalString (attrs ? postHook) attrs.postHook; /* Don't run Nix-specific build steps like patchelf. */ fixupPhase = "true"; @@ -1032,22 +1034,22 @@ rec { }; debian11i386 = { - name = "debian-11.5-bullseye-i386"; - fullName = "Debian 11.5 Bullseye (i386)"; + name = "debian-11.6-bullseye-i386"; + fullName = "Debian 11.6 Bullseye (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz"; - hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo="; + url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz"; + hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; debian11x86_64 = { - name = "debian-11.5-bullseye-amd64"; - fullName = "Debian 11.5 Bullseye (amd64)"; + name = "debian-11.6-bullseye-amd64"; + fullName = "Debian 11.6 Bullseye (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz"; - hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g="; + url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz"; + hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 703e71438a71..cf0a52d92274 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -54,6 +54,6 @@ fi tags=$(git ls-remote --tags --refs "$url") # keep only the version part of the tag -tags=$(echo "$tags" | cut --delimiter=/ --field=3) +tags=$(echo "$tags" | cut --delimiter=/ --field=3-) echo "$tags" diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index f839ce0c6dcd..59620b16a6cc 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/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/pkgs/data/fonts/blackout/default.nix b/pkgs/data/fonts/blackout/default.nix new file mode 100644 index 000000000000..b615aa66c59c --- /dev/null +++ b/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/pkgs/data/fonts/chunk/default.nix b/pkgs/data/fonts/chunk/default.nix new file mode 100644 index 000000000000..708393185e94 --- /dev/null +++ b/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/pkgs/data/fonts/fanwood/default.nix b/pkgs/data/fonts/fanwood/default.nix new file mode 100644 index 000000000000..ef8be0a6522a --- /dev/null +++ b/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/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 9d8c28681a9f..4bf50d338587 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "freefont-ttf"; version = "20120503"; - url = "mirror://gnu/freefont/freefont-ttf-${version}.zip"; + src = fetchzip { + url = "mirror://gnu/freefont/freefont-ttf-${version}.zip"; + hash = "sha256-K3kVHGcDTxQ7N7XqSdwRObriVkBoBYPKHbyYrYvm7VU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.ttf $out/share/fonts/truetype - sha256 = "sha256-bdMZg/mHYc0N6HiR8uNl0CjeOwBou+OYj3LPkyEUHUA="; + runHook postInstall + ''; meta = { description = "GNU Free UCS Outline Fonts"; @@ -24,6 +28,6 @@ fetchzip rec { homepage = "https://www.gnu.org/software/freefont/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/data/fonts/goudy-bookletter-1911/default.nix new file mode 100644 index 000000000000..3fd0352b5557 --- /dev/null +++ b/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/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 590163fc05fd..5baa9374a544 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "17.1.0"; + version = "19.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 53a54f346db1..f9609c6c485b 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/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/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6699023498cb..7c5525c85d00 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "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 = "0m8z67daj1gwb3yiw8qw3n1nxp96xb11fvb5183bh02r7ncym0da"; + iosevka-aile = "02jhyzk3bpsjng3b1jfffwvr2inhhjsm4jdahzj05j381fp717c4"; + iosevka-curly = "1si2kzv7qhlpyaaa954vnjmfk1c5rjxjimvckinpkjz30cnvg1bl"; + iosevka-curly-slab = "1ngk3r6kdqngksga3s3m615jkqrxdcplj8srvlb6642vcc38w6vh"; + iosevka-etoile = "1yg38x8dk5nyyjyy71v5j4x2x701hmp8gjwvphf5scf6vn52lvxz"; + iosevka-slab = "1bw6lyy8lg4vpalnrsrnkrm9dlyl6vm6faigy2y9bfvh7nxrd8qa"; + iosevka-ss01 = "1p02d8mdqx6mbnycs9d2r0qwqsxjrlgbl7skf8y66dsmjn6xxd0y"; + iosevka-ss02 = "0ds8ad38h7h8250hdm89v2imya6jdzgk1h5jgsf983ls1gqjikhc"; + iosevka-ss03 = "1s6rc4qhlfgvr7g8ywmlmsl58hfrqx0w24ivx5zz4jr5zqj70j7l"; + iosevka-ss04 = "1lc8kx0p8m8nm4ql6ylcw9g4iq0j65hv6x48273cclqqcmqdn4qj"; + iosevka-ss05 = "1wx02ysbj0rpr623jp1jy64ywrj8rm3n2fqzq05f4qv996bij11k"; + iosevka-ss06 = "1bf0qnpvbq94d42gvbzikfkk20d788cicsyk8kz1vsf5xbg37kla"; + iosevka-ss07 = "1ybl5gfyz4dnarimamshf002p9k6148wbbrbarpswb85kab502hd"; + iosevka-ss08 = "1llp8iryr5dixdarwls9iw8mmnhzhlr7q8fzq969p64ygk76rkn4"; + iosevka-ss09 = "14b49k0zv49xybdwrbf0p1krrga3jjviwzy0alxrwn0zf7vlbnbi"; + iosevka-ss10 = "1xs1dkq62pml17dii2lhsianhzr22059i17sw2b334wbszc00j7y"; + iosevka-ss11 = "0mrjzmk74vlq69ih4gm2iza4qdzyznn42bk3jwlvpd67z5vq36ag"; + iosevka-ss12 = "0z16a8wrydi0ch9zj0lcz6cxbvawkr0ck03bzdbb81waggk4fxin"; + iosevka-ss13 = "1rv8n3vbhwqv7bks6v86v4w13fr4a015xpvprzfz76xp98hb9dmc"; + iosevka-ss14 = "0m7kpvy8bknmrfsql9b24w7n15hybnkisjxzzmrxkf8a60jrydni"; + iosevka-ss15 = "006jkgww0hdb0c1wgby0y5535xapjpk1w8vm51d3yyrp04pwr1r1"; + iosevka-ss16 = "1mmc7cyyk64lcavb2gib64b64zcr7qcn0m3cmlwnr1zgm6nb3w64"; + iosevka-ss17 = "0wanv1h8qg5jyx7w380h7jkbc22slg9566pzw7dv7dg1nw0h2v3k"; + iosevka-ss18 = "1y1daxghw3jbfn785935906j76l0230yixdmwlrzyra2svyaql3w"; + sgr-iosevka = "182nzxxrxfz8xc3w8g9bsr0can71671w4xplyvyi7b1v9f62g9f5"; + sgr-iosevka-aile = "1arjiwx5qf8j6pzb8mpd1g46z0kn80341wvcmsnx42d97b2m64jx"; + sgr-iosevka-curly = "1lyh0rh2pswbaxsqyxicyknhla4gm2h0jb2rg0wx9vib9h53lazn"; + sgr-iosevka-curly-slab = "0h2j7dwcyd5v1acpwjsz9li5g4r1ssx715x5pj4gdvskq4calff4"; + sgr-iosevka-etoile = "15ag0w6sv24rc91mxh4c89gq6jwnq37bxml6a41rvn54fy0h1jnd"; + sgr-iosevka-fixed = "0935zbk5x0mk06al11nig74b2rv1x8zc3waxs8hvbri0ryzykzk4"; + sgr-iosevka-fixed-curly = "1i8cqfwcdsaxdlh87kaya8bp33fwlyz984r757122qnqbywcfm30"; + sgr-iosevka-fixed-curly-slab = "0ba77jxn8n5dssjpwj4iyvwxw3mxqizrvsz5jyv9a4f3gfvwi18k"; + sgr-iosevka-fixed-slab = "0qfhc7pg30ashpx504lln4h2w36icrbgij7fga07z2a715qxmfq9"; + sgr-iosevka-fixed-ss01 = "1597hn4vzh0r8j22k7866blj3kw2bhp70z7msfr2hbszpscwxwqg"; + sgr-iosevka-fixed-ss02 = "1ygrsvamgp6f26zg5qysk6dn4fa1im02dzsrlpgpv3sl4gh0cv44"; + sgr-iosevka-fixed-ss03 = "0936ggnzaavqn4d7fsmmf54bwp0v31sz0n1w15ky7c5bsqp9h8ja"; + sgr-iosevka-fixed-ss04 = "1xjslygh3f5nv0k8fiby0cgg22wr0a9jh79fbzallx3zh4d60a2a"; + sgr-iosevka-fixed-ss05 = "0vnm398zdvkzymhw41gljpf9jq52wq3vawiyw5xsdr75d4n63fpb"; + sgr-iosevka-fixed-ss06 = "1pnk8ijb193h85sk702ar0m0wk03xz1xcnvx8iq4k52q3a3vdd40"; + sgr-iosevka-fixed-ss07 = "0qfcf6r2gzc5zwjfrcq1hjp9c5s13fc34lwwmxkj8224d42543jn"; + sgr-iosevka-fixed-ss08 = "1ram9wm14k2sncfqpak23vss3pyqbwd1ndhm1i4ib7bpq8skd3wi"; + sgr-iosevka-fixed-ss09 = "0r8zy1fwih42clxm2rsjqks5rxgy1qxirz396r25gvwxng2503y4"; + sgr-iosevka-fixed-ss10 = "1v44s7n1gwz7mcybjsi1amv6xc8z47k20miycngjcy1cccrds2da"; + sgr-iosevka-fixed-ss11 = "1fdclqvzq45shpj97awc7636ymgrnfd69iaizwxy49y2krpa7dx9"; + sgr-iosevka-fixed-ss12 = "07f7i0qh9z6hlgy0ak3myxmiy4rbrixcap52lhk8wwapbnf21r7l"; + sgr-iosevka-fixed-ss13 = "07z3hfi5vynwl15dqfsldwjj5i9fldmm6i1nypm28cxbya3izj60"; + sgr-iosevka-fixed-ss14 = "1r001yna7ydf24bkgygld2kh47pvsz1yr9s57ssvdql37q24wzf1"; + sgr-iosevka-fixed-ss15 = "1757lzbp9payykcdywdbfilhgm1yij8gsnazc7bywpc4sv806vhz"; + sgr-iosevka-fixed-ss16 = "18mr7wvz5q60kgz0h2k05ahd0krz3ng7wgg1amd3292cji61vxvw"; + sgr-iosevka-fixed-ss17 = "1bykqwspssv1vbx2nns8dfckijqmd633g57glmlhjmxlavv5gxnw"; + sgr-iosevka-fixed-ss18 = "034w2yv2ihybkz03zalcsixrmjs7as62v8jhk8xkyckqc3bk0kc7"; + sgr-iosevka-slab = "04b1w9ij6dgy5gyvi7d47g9xadpb230mlgbdrk36fyhvfyw048y1"; + sgr-iosevka-ss01 = "077d4dan7f41ydi64xv0z0784j5vcj98vmqagmy1c1xyr0p68dac"; + sgr-iosevka-ss02 = "1hmy2cwnsb3f60yp66lznas78432518xkj2jmpqy8ad05d2zmmc8"; + sgr-iosevka-ss03 = "1bs1hb6magmbc2zh4fzx7h6j6bdllbvv85fv5krs3b888w3fzjw1"; + sgr-iosevka-ss04 = "1c3wb8nz0xz57crwn151b5sgzm320jkirsajyjf0srdaid1gkjkx"; + sgr-iosevka-ss05 = "1dx33y8rk3nzgdfikz262javq4v3n76hvv5b7rx7kxlkxycpy8ya"; + sgr-iosevka-ss06 = "1s54xx4w3zvbz2w7f5sl5vlqazwsm033jsq8ljrdh4c2l88mpcq3"; + sgr-iosevka-ss07 = "03zfq3jib2df6dhj1pbmw8hq57i0fx98gkawxzk13sfgrzz1zv47"; + sgr-iosevka-ss08 = "09k220gha919lv18bs6y2zlcjqa5j7jsq8mfqx8xddcwq1v9v094"; + sgr-iosevka-ss09 = "0plvxhqwkr52sich4kwzqs3xq5s5x61hq7n423ar2zaskx007sjv"; + sgr-iosevka-ss10 = "0c42h417sir120cp6fbnbhv3s1ys8pxky56v6f44h50w7p6qhlx1"; + sgr-iosevka-ss11 = "03sp7z0s5sb9bnhxb9liainpiqmq1r0lpmigscl6wr1rpaxq2l7i"; + sgr-iosevka-ss12 = "0y2xs0qv3b1k4s4my9c69j94ql2kwmqmm3f626vjj8rar8r0wab0"; + sgr-iosevka-ss13 = "1pyv3i1972n5gxr16fl68gydjsxndh7kbba3d15bmkankahgll6c"; + sgr-iosevka-ss14 = "1c7y8h8jv937wnlxkgdswb0ixa5v747z598pd0yhvwid3ksxb1px"; + sgr-iosevka-ss15 = "08wzzkr0l0xz4l7qk9kbhvybr4favl0qz0cjr7raw0hibqkw17sp"; + sgr-iosevka-ss16 = "0q63x71mq19gqqiaqbqsp0lvf3knhckx5d17caq6ipv5gs3xxmzr"; + sgr-iosevka-ss17 = "04054qbvyfvp1aqs3likyh85kqyckkg2ac83s65lvkj3f46r50sg"; + sgr-iosevka-ss18 = "1ckrfx3f4mncm1hbc2bcsbk97kkzsi524wfgvhz10jw1yk5yyd60"; + sgr-iosevka-term = "1ygfsc86fihkxpwm2q3j2y3ibpb7lkrjwrld7dg9ymb83hah29xm"; + sgr-iosevka-term-curly = "1qz8x2z23m5yvdpf0055a7xb5z77dabwbf3hkmh4r77rp1h6idv4"; + sgr-iosevka-term-curly-slab = "011n7qpcx2abvp5i9z6picy5bcjvvfx7pjqy8m7sf02fdm14s2jl"; + sgr-iosevka-term-slab = "1iwgcqnxbjf25k6bbx3iwcqy2ghwnnxvfinjp5slwr7bhjjjbl9y"; + sgr-iosevka-term-ss01 = "09s813a8ywqpncmq0iqkjjnh1sb5zn267fzp2dz92cmw5929627s"; + sgr-iosevka-term-ss02 = "1yyvnxdwi6caq6b6pgviad5l7b7znx4xkxdg1np23a7imr94vb1c"; + sgr-iosevka-term-ss03 = "1hrdipmf54z2hrl7g8m8z17aq3lp5v66xy24f58qsm4c1pfab3i7"; + sgr-iosevka-term-ss04 = "1h54glwrzblg61y4f1sxm78mci47wjry4h4gdrbpx96snf31ynbb"; + sgr-iosevka-term-ss05 = "1xzzj36817nsw15s3a1f740d89gc4634dnczjjj6vrddli8ilann"; + sgr-iosevka-term-ss06 = "0c07i831bmfz6y7jqaip6il4cvqzc51d0w17s2dnjrnj4x3ndgmx"; + sgr-iosevka-term-ss07 = "0x9wzf0w4pzjmzzbmzj56nkhhz5834chvxqn9519fbq1md4pfl3b"; + sgr-iosevka-term-ss08 = "1gf1l17d8hrf1aq4pq9ai05kan8m86z8s2d7masjkvg1zaw2lb4s"; + sgr-iosevka-term-ss09 = "1nnhciib413ll2h7ps3vyghiayz9iwniwr7byyn9pdimm0j5vq07"; + sgr-iosevka-term-ss10 = "0qvficwhpya5sy5myxsjjfmrn9z2d9lpzyi88l8dhz3dfvyr1yzs"; + sgr-iosevka-term-ss11 = "0ml6swvyddhz2nvq14skfh1d9d98c3d6ir0qgf97pc0qxyqbcfp2"; + sgr-iosevka-term-ss12 = "01nxs1m2iif6lswx22h58i45zxab0nbqpf0rzlp6v3wnb8ylpbi5"; + sgr-iosevka-term-ss13 = "0zadj9fakpqmibnxz883hwbcgqfssjvsi6kcvzik5cnamlk2jz8c"; + sgr-iosevka-term-ss14 = "1dwfm8lcbgf8rfw11i2alrv98f9332cqyk9zvzfrjrdp9camr7j0"; + sgr-iosevka-term-ss15 = "0z7ad7vy2faq33kpbl1x2w6i3s4af8v8fzj05rdyadws35ra3idd"; + sgr-iosevka-term-ss16 = "1fzzkmk7ppcbmg7s50nknc7nwavfpqsja12af8qidzba9z535w2g"; + sgr-iosevka-term-ss17 = "1rcpfgf5blg3nbf6prw9h2ylc2ji8vl6cxqlck482kncz8ph9swk"; + sgr-iosevka-term-ss18 = "1nksii5xyi97lsrf1hxl06m0pdlk8rnsbg1s81amkzz8fxlyhzlc"; } diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index e99dfde411dc..6054066465c3 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.047"; + version = "0.048"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-tCZo48SBGdhcsP1wgaWkfWr3L3Yz+p/iqesLmarSWbk="; + hash = "sha256-KSyJMlQclEj2CR+5uSYLmPtseWiDIUuahaPDx7Tn/bw="; }; installPhase = '' diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/data/fonts/junction/default.nix new file mode 100644 index 000000000000..7f5ba5c4a201 --- /dev/null +++ b/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/pkgs/data/fonts/knewave/default.nix b/pkgs/data/fonts/knewave/default.nix new file mode 100644 index 000000000000..eaadb7afc0de --- /dev/null +++ b/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/pkgs/data/fonts/league-gothic/default.nix b/pkgs/data/fonts/league-gothic/default.nix new file mode 100644 index 000000000000..4186eb70f6db --- /dev/null +++ b/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/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index f6855dc99d66..905cf0a9adec 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/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/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/pkgs/data/fonts/league-of-moveable-type/fonts.nix deleted file mode 100644 index efbe6a4c41cb..000000000000 --- a/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/pkgs/data/fonts/league-of-moveable-type/update.sh b/pkgs/data/fonts/league-of-moveable-type/update.sh deleted file mode 100644 index 4d41df4fdb85..000000000000 --- a/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 <> main.go + ''; + + buildPhase = '' + runHook preBuild + go run -v . + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm644 geosite.db $out/share/sing-box/geosite.db + runHook postInstall + ''; + + meta = with lib; { + description = "community managed domain list"; + homepage = "https://github.com/SagerNet/sing-geosite"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ linsui ]; + }; +} diff --git a/pkgs/data/misc/sing-geosite/main.go b/pkgs/data/misc/sing-geosite/main.go new file mode 100644 index 000000000000..d059d99ffe1e --- /dev/null +++ b/pkgs/data/misc/sing-geosite/main.go @@ -0,0 +1,19 @@ +func main() { + outputFile, err := os.Create("geosite.db") + if err != nil { + panic(err) + } + defer outputFile.Close() + vData, err := ioutil.ReadFile("@geosite_data@") + if err != nil { + panic(err) + } + domainMap, err := parse(vData) + if err != nil { + panic(err) + } + err = geosite.Write(outputFile, domainMap) + if err != nil { + panic(err) + } +} diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index bf27cb03e285..ae14a27c8b7f 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -1,4 +1,5 @@ { lib +, stdenvNoCC , fetchurl , symlinkJoin }: @@ -6,30 +7,40 @@ let version = "15.0"; - fetchData = { file, sha256 }: fetchurl { - url = "https://www.unicode.org/Public/emoji/${version}/${file}"; - inherit sha256; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' + fetchData = { suffix, hash }: stdenvNoCC.mkDerivation { + pname = "unicode-emoji-${suffix}"; + inherit version; + + src = fetchurl { + url = "https://www.unicode.org/Public/emoji/${version}/emoji-${suffix}.txt"; + inherit hash; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + installDir="$out/share/unicode/emoji" mkdir -p "$installDir" - mv "$downloadedFile" "$installDir/${file}" + cp "$src" "$installDir/emoji-${suffix}.txt" + + runHook postInstall ''; }; srcs = { emoji-sequences = fetchData { - file = "emoji-sequences.txt"; - sha256 = "sha256-vRpXHAcdY3arTnFwBH3WUW3DOh8B3L9+sRcecLHZ2lg="; + suffix = "sequences"; + hash = "sha256-XCIi2KQy2JagMaaML1SwT79HsPzi5phT8euKPpRetW0="; }; emoji-test = fetchData { - file = "emoji-test.txt"; - sha256 = "sha256-3Rega6+ZJ5jXRhLFL/i/12V5IypEo5FaGG6Wf9Bj0UU="; + suffix = "test"; + hash = "sha256-hEXyOsg4jglr4Z0CYuFPzv+Fb/Ugk/I1bciUhfGoU9s="; }; emoji-zwj-sequences = fetchData { - file = "emoji-zwj-sequences.txt"; - sha256 = "sha256-9AqrpyUCiBcR/fafa4VaH0pT5o1YzEZDVySsX4ja1u8="; + suffix = "zwj-sequences"; + hash = "sha256-/jV/kRe3dGZ2Bjdl1YcTft+bJZA6eSvVSTW/CFZ5EYI="; }; }; in diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 14299bdc522a..fa0bf9cb4873 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230106031328"; + version = "20230202101858"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU="; + hash = "sha256-9K3Tjm1tVw5KJgT6UFcVmn/JzQidKCaQyC4EFX23QE0="; }; - vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; + vendorHash = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index be7466674259..7cf3ea02e192 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202302020047"; + version = "202302160443"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9ab244ed78fea88a1ce5bf789fb31bbcd81e8d17"; - sha256 = "sha256-2NYuvzOU0W3qZqWZMr3rTNqX+0rH3fhIr1zCD5dSdWc="; + rev = "f8fbab498f52848317db703f57f0c839e81cd587"; + sha256 = "sha256-9LZxVNhigy2cO41d8nZtFrfDoCjJTdzrGUZpmjcpje8="; }; installPhase = '' diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix new file mode 100644 index 000000000000..79bca7720207 --- /dev/null +++ b/pkgs/data/themes/breath-theme/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kdecoration +, plasma-workspace +, qtbase +}: + +stdenv.mkDerivation { + pname = "breath-theme"; + version = "unstable-2022-12-22"; + + src = fetchFromGitLab { + domain = "gitlab.manjaro.org"; + owner = "themes"; + group = "artwork"; + repo = "breath"; + rev = "98822e7d903f16116bfb02ff9921824c139d7bbc"; + sha256 = "sha256-gvzhHOuOhxV3TC3UZeVpxeSDLpCJV+SaapcJ5mbHskY="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + + kdecoration + plasma-workspace + qtbase + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ "-DBUILD_PLASMA_THEMES=ON" "-DBUILD_SDDM_THEME=ON" ]; + + meta = with lib; { + description = "Manjaro KDE default theme"; + homepage = "https://gitlab.manjaro.org/artwork/themes/breath"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ huantian ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 6e5dc5f35a18..a5bfac658b42 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: +{ lib +, stdenv +, fetchurl +, gtk-engine-murrine +, gitUpdater +}: stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "sha256-ptiJeb4ebfnH6HpTN1NsPAYbkLlPcZtn2aBKO0zW2Tw="; + sha256 = "sha256-WvSlzCock0UMdvajHRBNHSugVMStR1FDt9vjzX5Kp8A="; }; sourceRoot = "."; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' runHook preInstall @@ -20,8 +27,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/madmaxms/theme-obsidian-2"; + rev-prefix = "v"; + }; + meta = with lib; { - description = "Gnome theme, based upon Adwaita-Maia dark skin"; + description = "Gnome theme based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3Only ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix new file mode 100644 index 000000000000..a117562174e5 --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk-engine-murrine +}: + +stdenvNoCC.mkDerivation { + pname = "tokyo-night-gtk"; + version = "2023.01.17"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; + sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a themes/* $out/share/themes + runHook postInstall + ''; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette."; + homepage = "www.pling.com/p/1681315/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ garaiza-93 ]; + }; +} diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 1073fd8f2505..c01c8e08166e 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2022-10-27"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-jOrTasnkNExCgvST+09JOQ0iosjoEu3aoj3C1pNHTgY="; + sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; }; nativeBuildInputs = [ @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { done # Do not provide `sudo`, as it is not needed in our use case of the install script - substituteInPlace lib-core.sh --replace '$(which sudo)' false + substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false # Provides a dummy home directory - substituteInPlace lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' + substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix new file mode 100644 index 000000000000..44cafeb6fb1a --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, udisks2-qt5 +, gio-qt +, image-editor +, glibmm +, freeimage +, opencv +, ffmpeg +, ffmpegthumbnailer +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-album"; + version = "5.10.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-S/oVRD72dtpnvfGV6YfN5/syrmWA44H/1BbmAe0xjAY="; + }; + + # This patch should be removed after upgrading to 6.0.0 + postPatch = '' + substituteInPlace libUnionImage/CMakeLists.txt \ + --replace "/usr" "$out" + substituteInPlace src/CMakeLists.txt \ + --replace "set(PREFIX /usr)" "set(PREFIX $out)" \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/share/deepin-manual/manual-assets/application/)" "share/deepin-manual/manual-assets/application/)" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + udisks2-qt5 + gio-qt + image-editor + glibmm + freeimage + opencv + ffmpeg + ffmpegthumbnailer + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "A fashion photo manager for viewing and organizing pictures"; + homepage = "https://github.com/linuxdeepin/deepin-album"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix new file mode 100644 index 000000000000..d62c72ca0b11 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, udisks2-qt5 +, cmake +, qtbase +, qttools +, pkg-config +, kcodecs +, karchive +, wrapQtAppsHook +, minizip +, libzip +, libarchive +}: + +stdenv.mkDerivation rec { + pname = "deepin-compressor"; + version = "5.12.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-HJDtUvXUT94G4WqrK92UMmijnuC4ApkKHU3yE3rOKHQ="; + }; + + postPatch = '' + substituteInPlace src/source/common/pluginmanager.cpp \ + --replace "/usr/lib/" "$out/lib/" + substituteInPlace src/desktop/deepin-compressor.desktop \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + udisks2-qt5 + kcodecs + karchive + minizip + libzip + libarchive + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + "-DUSE_TEST=OFF" + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A fast and lightweight application for creating and extracting archives"; + homepage = "https://github.com/linuxdeepin/deepin-compressor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix new file mode 100644 index 000000000000..2138d910960f --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-draw"; + version = "5.11.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-49RQQ52HR5aqzeVEjGm9vQpTOxhY7I0X724x/Bboo90="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-draw/commit/dac714fe603e1b77fc39952bfe6949852ee6c2d5.patch"; + sha256 = "sha256-zajxmKkZJT1lcyvPv/PRPMxcstF69PB1tC50gYKDlWA="; + }) + ]; + + postPatch = '' + substituteInPlace com.deepin.Draw.service \ + --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + ]; + + 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 = "Lightweight drawing tool for users to freely draw and simply edit images"; + homepage = "https://github.com/linuxdeepin/deepin-draw"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch b/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch new file mode 100644 index 000000000000..61d13556acb6 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch @@ -0,0 +1,25 @@ +From c2fa29800c64f5bda04203bb2eb1845b29c1de3c Mon Sep 17 00:00:00 2001 +From: rewine +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/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix new file mode 100644 index 000000000000..0b51bc42b2c5 --- /dev/null +++ b/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/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix new file mode 100644 index 000000000000..0d710652e389 --- /dev/null +++ b/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/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix new file mode 100644 index 000000000000..f7ab5220b61c --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, qtwebengine +, karchive +, poppler +, libchardet +, libspectre +, openjpeg +, djvulibre +, gtest +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-reader"; + version = "5.10.28"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI="; + }; + + patches = [ ./use-pkg-config.diff ]; + + postPatch = '' + substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtwebengine + karchive + poppler + libchardet + libspectre + djvulibre + openjpeg + gtest + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A simple memo software with texts and voice recordings"; + homepage = "https://github.com/linuxdeepin/deepin-reader"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff new file mode 100644 index 000000000000..7993cecd30ad --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff @@ -0,0 +1,46 @@ +diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +index 3e04f340..894b0ac7 100755 +--- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri ++++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \ + USE_SYSTEM_LIBOPENJPEG2 \ + USE_SYSTEM_FREETYPE + +-INCLUDEPATH += /usr/include/openjpeg-2.3 \ +- /usr/include/openjpeg-2.4 \ +- /usr/include/freetype2 \ +- /usr/include/freetype2/freetype \ +- /usr/include/freetype2/freetype/config +- +-LIBS += -lopenjp2 -llcms2 -lfreetype ++CONFIG += link_pkgconfig ++PKGCONFIG += libopenjp2 lcms2 freetype2 + + #QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang + #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions. +diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro +index 196b91d3..bda71ff4 100755 +--- a/3rdparty/deepin-pdfium/src/src.pro ++++ b/3rdparty/deepin-pdfium/src/src.pro +@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium + + TEMPLATE = lib + +-CONFIG += c++14 ++CONFIG += c++14 link_pkgconfig ++ ++PKGCONFIG += chardet + + ###安全漏洞检测 + #QMAKE_CXX += -g -fsanitize=undefined,address -O2 +@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri) + + INCLUDEPATH += $$PWD/../include + +-INCLUDEPATH += /usr/include/chardet +- +-LIBS += -lchardet +- + public_headers += \ + $$PWD/../include/dpdfglobal.h \ + $$PWD/../include/dpdfdoc.h \ diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix new file mode 100644 index 000000000000..8aa58bfa30b5 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, qtbase +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, qtmultimedia +, qtwebengine +, libvlc +, gst_all_1 +, gtest +}: +stdenv.mkDerivation rec { + pname = "deepin-voice-note"; + version = "5.10.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZDw/kGmhcoTPDUsZa9CYhrVbK4Uo75G0L4q4cCBPr7E="; + }; + + postPatch = '' + substituteInPlace src/common/audiowatcher.cpp \ + --replace "/usr/share" "$out/share" + substituteInPlace assets/deepin-voice-note.desktop \ + --replace "/usr/bin" "$out/bin" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtmultimedia + qtwebengine + libvlc + gtest + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); + + cmakeFlags = [ "-DVERSION=${version}" ]; + + NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Simple memo software with texts and voice recordings"; + homepage = "https://github.com/linuxdeepin/deepin-voice-note"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index ec3302908a05..5afb5e03059c 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/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,15 +30,36 @@ 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 { }; + deepin-reader = callPackage ./apps/deepin-reader { }; + deepin-voice-note = callPackage ./apps/deepin-voice-note { }; + + #### 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 { }; + dde-api = callPackage ./go-package/dde-api { inherit replaceAll; }; + 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/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch b/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch new file mode 100644 index 000000000000..c4726982241d --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch @@ -0,0 +1,39 @@ +From c8f597bd7286a76e7ce371e4f7982d9d2700868a Mon Sep 17 00:00:00 2001 +From: rewine +Date: Wed, 28 Dec 2022 23:06:53 +0800 +Subject: [PATCH] fix PATH for NixOS + +--- + device/main.go | 2 +- + locale-helper/main.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/device/main.go b/device/main.go +index 6c5404c..f79bcfc 100644 +--- a/device/main.go ++++ b/device/main.go +@@ -15,7 +15,7 @@ import ( + var logger = log.NewLogger(dbusServiceName) + + func main() { +- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") ++ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") + service, err := dbusutil.NewSystemService() + if err != nil { + logger.Fatal("failed to new system service:", err) +diff --git a/locale-helper/main.go b/locale-helper/main.go +index 0866e48..ef000b5 100644 +--- a/locale-helper/main.go ++++ b/locale-helper/main.go +@@ -45,7 +45,7 @@ var ( + ) + + func main() { +- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") ++ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") + logger.BeginTracing() + defer logger.EndTracing() + +-- +2.38.1 + diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix new file mode 100644 index 000000000000..ef4a287b3df9 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, replaceAll +, wrapQtAppsHook +, wrapGAppsHook +, gtk3 +, pkg-config +, deepin-gettext-tools +, alsa-lib +, go-dbus-factory +, go-gir-generator +, go-lib +, libcanberra +, libgudev +, librsvg +, poppler +, pulseaudio +, gdk-pixbuf-xlib +, dbus +, coreutils +, deepin-desktop-base +}: + +buildGoPackage rec { + pname = "dde-api"; + version = "5.5.32"; + + goPackagePath = "github.com/linuxdeepin/dde-api"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-F+vEOSpysqVtjs8de5mCmeANuCbYUQ860ZHl5rwNYac="; + }; + + patches = [ ./0001-fix-PATH-for-NixOS.patch ]; + + postPatch = replaceAll "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + + replaceAll "/usr/share/i18n/language_info.json" "${deepin-desktop-base}/share/i18n/language_info.json" + + replaceAll "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" + + replaceAll "/usr/bin/true" "${coreutils}/bin/true" + + replaceAll "/usr/sbin/alsactl" "alsactl" + + '' + substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \ + --replace "/usr/share/dde-api" "$out/share/dde-api" + substituteInPlace themes/{theme.go,settings.go} \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkg-config + deepin-gettext-tools + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + gtk3 + alsa-lib + libcanberra + libgudev + librsvg + poppler + pulseaudio + gdk-pixbuf-xlib + ]; + + 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 DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath} + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + for binary in $out/lib/deepin-api/*; do + wrapProgram $binary "''${qtWrapperArgs[@]}" + done + ''; + + meta = with lib; { + description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc"; + homepage = "https://github.com/linuxdeepin/dde-api"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/dde-api/deps.nix b/pkgs/desktops/deepin/go-package/dde-api/deps.nix new file mode 100644 index 000000000000..52ee3d963cf9 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/deps.nix @@ -0,0 +1,210 @@ +[ + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "sha256-uViE2kPj7tMrGYVjjdLOl2jFDmmu+3P7GvnZBse2zVY="; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "sha256-pSeMTPvSkxlthh65LjNYYhPLvCZDkBgVgAGYWW0Aguo="; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "0.6.9"; + sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA="; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlites"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.14.12"; + sha256 = "sha256-SLW1FyyfJGPUid1epgmJHZGJebI77Wg5WMAPiz1GcYs="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + 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/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://github.com/golang/image"; + rev = "a8550c1d254a56cf1762a2993881d2b23c0c83dd"; + sha256 = "sha256-gtRGCsCe8tKLsZWhKLL8c5whz9rCMoCHfH13rcSW/OM="; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "b94a6e3cc13755c0a75fffecbb089eb346fc4289"; + sha256 = "sha256-uriYmwxT69xbmWKO/5OAyeMa2lFBOJDrU2KtQh/+ZjY="; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "sha256-RsS4qxdRQ3q+GejA8D9Iu31A/mZNms4LbJ7518jWiu4="; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "sha256-psUCHRFGEOpN3obFbCvSfW0AGEFSI29d0q4MFsHG3qI="; + }; + } + { + goPackagePath = "github.com/fogleman/gg"; + fetch = { + type = "git"; + url = "https://github.com/fogleman/gg"; + rev = "v1.3.0"; + sha256 = "sha256-Fs2JI0FmF4N5EzXJzGAPZMxZxo6wKyebkN/iBZ9sdNo="; + }; + } + { + goPackagePath = "github.com/golang/freetype"; + fetch = { + type = "git"; + url = "https://github.com/golang/freetype"; + rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; + sha256 = "sha256-rOOsv1sNLbYEKnwXZtUlB2CXVkFANyzZy2E7w2QbnKQ="; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; + sha256 = "sha256-8U2oSi446U13c3uqcbg/14okypxKmckRuvWfZlGHVys="; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA="; + }; + } + { + goPackagePath = "github.com/youpy/go-wav"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-wav"; + rev = "v0.3.2"; + sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM="; + }; + } + { + goPackagePath = "github.com/zaf/g711"; + fetch = { + type = "git"; + url = "https://github.com/zaf/g711"; + rev = "v1.2"; + sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY="; + }; + } + { + goPackagePath = "github.com/youpy/go-riff"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-riff"; + rev = "v0.1.0"; + sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8="; + }; + } +] + diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix new file mode 100644 index 000000000000..040c561d352e --- /dev/null +++ b/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/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix new file mode 100644 index 000000000000..509940b6d570 --- /dev/null +++ b/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/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix new file mode 100644 index 000000000000..4c12dce491d7 --- /dev/null +++ b/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/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix new file mode 100644 index 000000000000..7f377d2a6e74 --- /dev/null +++ b/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/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix new file mode 100644 index 000000000000..3a6a8f03dfb5 --- /dev/null +++ b/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/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix new file mode 100644 index 000000000000..8aaf7929c5ab --- /dev/null +++ b/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/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg b/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg new file mode 100644 index 000000000000..18f8d4055c39 --- /dev/null +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix new file mode 100644 index 000000000000..7eaca5768607 --- /dev/null +++ b/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/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix new file mode 100644 index 000000000000..d219e6d73b16 --- /dev/null +++ b/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/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index df63449c2f61..902178d16706 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,19 +1,21 @@ {lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango -, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: +, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 +, testers +}: -with lib; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "2.10.5"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; - patches = optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; @@ -31,13 +33,19 @@ stdenv.mkDerivation rec { atk cairo glib gtk2 pango libxml2Python perl gettext - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ gnome-common gtk-mac-integration-gtk2 ]; - preConfigure = optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' intltoolize --force ''; doCheck = false; # requires X11 daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gtksourceview-2.0" ]; + }; +}) diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4c9f28230c31..7ce615fb3c71 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib -, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-vfs"; version = "2.24.4"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; @@ -35,4 +39,10 @@ stdenv.mkDerivation rec { postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ]; + }; +}) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index c79d3d731ea9..4f036de24d73 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hmwGIsZv21rSpHXpz8zLIZocZDHwCayyKR1D8hQLFH4="; + sha256 = "pUuUPv5CAQqcEuTc2ts3e/NslMOAB3i4Uww6g0QJ3Mc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 60de418f1e44..bbab612b9c8d 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , vala , meson @@ -36,6 +37,14 @@ stdenv.mkDerivation rec { hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0="; }; + patches = [ + (fetchpatch { + name = "gpg-2.4.patch"; + url = "https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c74779be3d7a378db0671af862ffa3573d42.patch"; + hash = "sha256-4QiFgH4jC1ucmA9fFozUQZ3Mat76SgpYkMpRz80RH64="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 082483b1c247..f5ea57f1f800 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.46.3"; + version = "3.46.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4="; + sha256 = "pZslQUXFn6zXx7U4LbeNxfDtH2pum4/n1edZWfk8DMg="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index dfe109f57bda..c0cfade44b4e 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -298,7 +298,7 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 611d5c8..4790fca 100644 +index 28755e2..da8c40c 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 760af24880c4..560d40ddc115 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE="; + sha256 = "Ug3IjJAce4/n4SoBOhQlz+2R8vhAhIWitJ+SxnWZACA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index c018b4ea4a34..0b4d71adc5fe 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "43.2"; + version = "43.4.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM="; + sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 450da49cf980..591bd397c0ac 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.3"; + version = "43.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA="; + sha256 = "6d8GDrq1n0lpfV7yYw7DbeYEVBadwZGvYNNINyCq2z4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index aa3c7ed39811..9d2e3d4eff74 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome +, testers +}: let pname = "libgnome-keyring"; version = "3.12.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -17,10 +19,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; longDescription = '' @@ -29,4 +34,4 @@ stdenv.mkDerivation rec { with the gnome-keyring system. ''; }; -} +}) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index c2414020968e..6c5d6bc64b74 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.0"; + version = "0.42.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s="; + sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json index 47580d7f53c7..8beb54621329 100644 --- a/pkgs/desktops/gnome/extensions/collisions.json +++ b/pkgs/desktops/gnome/extensions/collisions.json @@ -187,6 +187,10 @@ "lockkeys@vaina.lt", "lockkeys@fawtytoo" ], + "clipboard-indicator": [ + "clipboard-indicator@tudmotu.com", + "clipboard-indicator@Dieg0Js.github.io" + ], "noannoyance": [ "noannoyance@sindex.com", "noannoyance@daase.net" @@ -221,10 +225,22 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "horizontal-workspace-indicator@tty2.io" ], + "clipboard-indicator": [ + "clipboard-indicator@tudmotu.com", + "clipboard-indicator@Dieg0Js.github.io" + ], + "keep-awake": [ + "KeepAwake@jepfa.de", + "awake@vixalien.com" + ], "noannoyance": [ "noannoyance@sindex.com", "noannoyance@daase.net" ], + "battery-time": [ + "batime@martin.zurowietz.de", + "batterytime@typeof.pw" + ], "floating-panel": [ "floating-panel@aylur", "floating-panel-usedbymyself@wpism" diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 81622db59c1e..d21f994a43af 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/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/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch new file mode 100644 index 000000000000..03b016cae249 --- /dev/null +++ b/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/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 189a84d335f2..dbd8a49a924b 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,17 +12,23 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; - # no source repository can be found for this extension - "floating-panel@aylur" = "floating-panel"; - "floating-panel-usedbymyself@wpism" = null; + "clipboard-indicator@tudmotu.com" = "clipboard-indicator"; + "clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2"; - # forks of each other, azan@faissal.bensefia.id is more recent - "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; - "azan@hatem.masmoudi.org" = null; + # DEPRECATED: Use "Caffeine" instead + "KeepAwake@jepfa.de" = "keep-awake"; + "awake@vixalien.com" = null; "noannoyance@sindex.com" = "noannoyance"; "noannoyance@daase.net" = "noannoyance-2"; + "batime@martin.zurowietz.de" = "battery-time"; + "batterytime@typeof.pw" = "battery-time-2"; + + # no source repository can be found for this extension + "floating-panel@aylur" = "floating-panel"; + "floating-panel-usedbymyself@wpism" = null; + # ############################################################################ # These are conflicts for older extensions (i.e. they don't support the latest GNOME version). # Make sure to move them up once they are updated @@ -85,6 +91,10 @@ "transparent-window@pbxqdown.github.com" = "transparent-window"; "transparentwindows.mdirshad07" = null; + # Forks of each other, azan@faissal.bensefia.id is more recent + "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; + "azan@hatem.masmoudi.org" = null; + # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 "flypie@schneegans.github.com" = null; diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index 4fd053d76d86..ec8b64349809 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -35,10 +35,10 @@ , {"uuid": "calc@danigm.wadobo.com", "name": "calc", "pname": "calc", "description": "Simple run dialog calculation", "link": "https://extensions.gnome.org/extension/388/calc/", "shell_version_map": {"40": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1mpy3vvmisidy2czhlz18jvgvp2rd3sd7pgm7ky28kw9zxmihxxr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWxjQGRhbmlnbS53YWRvYm8uY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "remmina-search-provider@alexmurray.github.com", "name": "Remmina Search Provider", "pname": "remmina-search-provider", "description": "Search for Remmina Remote Desktop Connections\n\nEasily search for and launch connections to remote machines by name and protocol.", "link": "https://extensions.gnome.org/extension/473/remmina-search-provider/", "shell_version_map": {"40": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "1z1myqwj9wmz3li7y6zlb3ma1icmj2gpna4qb8nzm6girrkajwda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleG11cnJheS9yZW1taW5hLXNlYXJjaC1wcm92aWRlci8iLAogICJ1dWlkIjogInJlbW1pbmEtc2VhcmNoLXByb3ZpZGVyQGFsZXhtdXJyYXkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "16", "sha256": "0mlbda3rln4fr4i9hzy36xkfw8xnr3y5q6rc3zvv1nz24zavzlhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmb3IgUmVtbWluYSBSZW1vdGUgRGVza3RvcCBDb25uZWN0aW9uc1xuXG5FYXNpbHkgc2VhcmNoIGZvciBhbmQgbGF1bmNoIGNvbm5lY3Rpb25zIHRvIHJlbW90ZSBtYWNoaW5lcyBieSBuYW1lIGFuZCBwcm90b2NvbC4iLAogICJuYW1lIjogIlJlbW1pbmEgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhtdXJyYXkvcmVtbWluYS1zZWFyY2gtcHJvdmlkZXIvIiwKICAidXVpZCI6ICJyZW1taW5hLXNlYXJjaC1wcm92aWRlckBhbGV4bXVycmF5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "uptime-indicator@gniourfgniourf.gmail.com", "name": "Uptime Indicator", "pname": "uptime-indicator", "description": "Indicates uptime in status area. When clicked, a popup menu indicates the date when the system was started.", "link": "https://extensions.gnome.org/extension/508/uptime-indicator/", "shell_version_map": {"38": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "0hw8z7l0d8p2fmd8sv8bdgvhwzj9asackcjav0hx9hjfkvqs625k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR25pb3VyZi9VcHRpbWUtSW5kaWNhdG9yIiwKICAidXVpZCI6ICJ1cHRpbWUtaW5kaWNhdG9yQGduaW91cmZnbmlvdXJmLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "caffeine@patapon.info", "name": "Caffeine", "pname": "caffeine", "description": "Disable the screensaver and auto suspend", "link": "https://extensions.gnome.org/extension/517/caffeine/", "shell_version_map": {"38": {"version": "37", "sha256": "05g1910jcwkjl9gmvnk57ip20sbzy09mk4v6q2fm0pg8398v0vhf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiAzNwp9"}, "40": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "41": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "42": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "43": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} +, {"uuid": "caffeine@patapon.info", "name": "Caffeine", "pname": "caffeine", "description": "Disable the screensaver and auto suspend", "link": "https://extensions.gnome.org/extension/517/caffeine/", "shell_version_map": {"38": {"version": "37", "sha256": "05g1910jcwkjl9gmvnk57ip20sbzy09mk4v6q2fm0pg8398v0vhf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiAzNwp9"}, "40": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "41": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "42": {"version": "42", "sha256": "1bg5kvkf6kic1cp8r3h2h1qzyhnk0625b1gln6jxjfnygna9n197", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "43": {"version": "44", "sha256": "0rpknbpscv24pvcgpl3r3f6g51zk7rbhvh76sj4j51v0jfrrw710", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {"38": {"version": "18", "sha256": "155fpm71cfy23xj9pz0n7299vc4rdfkd5mjgg55vkz8wh76xbc7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvQmFja1NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "26", "sha256": "0yiw8il1n49pr97gp0xfkq450w2hk6x5r4860388nmpy07p73p8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYml0YnVja2V0Lm9yZy9MdWthc0tudXRoL2JhY2tzbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "43": {"version": "27", "sha256": "00lyf80h6g9p3c79k50b5vhv176k7d2snhyb5q2vlp0mg2rp8n6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL0JhY2tTbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "historymanager-prefix-search@sustmidown.centrum.cz", "name": "HistoryManager Prefix Search", "pname": "historymanager-prefix-search", "description": "Use PageUp and PageDown to move in HistoryManager (eg. RunCommand, Looking Glass) according to prefix", "link": "https://extensions.gnome.org/extension/544/historymanager-prefix-search/", "shell_version_map": {"40": {"version": "14", "sha256": "1n6gac80xrk6lhlj29zb03h62ia0a66va0i9pmjgqbg3bs74yds0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBQYWdlVXAgYW5kIFBhZ2VEb3duIHRvIG1vdmUgaW4gSGlzdG9yeU1hbmFnZXIgKGVnLiBSdW5Db21tYW5kLCBMb29raW5nIEdsYXNzKSBhY2NvcmRpbmcgdG8gcHJlZml4IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlzdG9yeW1hbmFnZXItcHJlZml4LXNlYXJjaCIsCiAgIm5hbWUiOiAiSGlzdG9yeU1hbmFnZXIgUHJlZml4IFNlYXJjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy43LjMiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VzdG1pL2dub21lLXNoZWxsLWV4dGVuc2lvbi1oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAidXVpZCI6ICJoaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoQHN1c3RtaWRvd24uY2VudHJ1bS5jeiIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "40": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "41": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "42": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}, "43": {"version": "111", "sha256": "0gxg9sk3zpl7azhyyp5xb9hmlh604mpaf7hv6va2c5zpmbvhmrwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMQp9"}}} +, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "40": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "41": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "42": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "43": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}}} , {"uuid": "hdate@hatul.info", "name": "Gnome HDate", "pname": "gnome-hdate", "description": "Show Hebrew Date in the Panel.\nRequires libhdate-glib", "link": "https://extensions.gnome.org/extension/554/gnome-hdate/", "shell_version_map": {"40": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "0nxn93jxagzld6x0rxi56q1y8lcjzh2p82jhxli90cg940w38jj9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWlhZC9nbm9tZS1oZGF0ZSIsCiAgInV1aWQiOiAiaGRhdGVAaGF0dWwuaW5mbyIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "todo.txt@bart.libert.gmail.com", "name": "Todo.txt", "pname": "todotxt", "description": "A Gnome shell interface for todo.txt. \n\nTodo.txt is a future-proof syntax for tasks (not made by me), for more info: http://todotxt.com/\n\nSome examples:\nTask: Basic task\n(A) Task: High priority task\nTask @project +context: Task is part of project and has a certain context\nx 2013-08-22 Task: Task was completed on the 22nd of August\n\nFor more info about the syntax: https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format\n\nQuick start:\nWhen you first enable the extension, chances are high you'll see a [X] in your top panel. If you click the [X], you will be able to choose between creating the necessary files automatically or selecting your own existing files to be used with the extension.\n\nPlease use the issue tracker on the homepage to report bugs and/or file feature requests, this makes tracking easier for me. Thanks!\n\nSee the included CHANGELOG.md for info about changes between different versions, or see it online: https://gitlab.com/todo.txt-gnome-shell-extension/todo-txt-gnome-shell-extension/-/blob/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1b0482ibbsvi4bhkl6a8gr0kv63cnbgaim02ysi0plqg4bcirxk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "35", "sha256": "1f6gbsh6gs1kv0clgw9is7wg9cb8dr960ll7mk07s9jd2gxymsdq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "42": {"version": "37", "sha256": "19n83bachj4b6lvfsp6j4gpgm9wahxlz1is2954hw4d45m5yzfbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "43": {"version": "39", "sha256": "1kys4rhjzz42z6mz20a2sxzzrndgvl8r2ff1zwf0wanbc6af8ln0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi8tL2Jsb2IvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgImdldHRleHQtZG9tYWluIjogInRvZG90eHQiLAogICJuYW1lIjogIlRvZG8udHh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} , {"uuid": "text_translator@awamper.gmail.com", "name": "Text Translator", "pname": "text-translator", "description": "** Needs the package translate-shell **\nTranslation of the text by different translators (currently Google.Translate, Yandex.Translate).\nShortcuts:\nSuper+T - open translator dialog.\nSuper+Shift+T - open translator dialog and translate text from clipboard.\nSuper+Alt+T - open translator dialog and translate from primary selection.\nCtrl+Enter+ - Translate text.\nCtrl+Shift+C - copy translated text to clipboard.\nCtrl+S - swap languages.\nCtrl+D - reset languages to default\nTab+ - toggle transliteration of result text.", "link": "https://extensions.gnome.org/extension/593/text-translator/", "shell_version_map": {"38": {"version": "36", "sha256": "1idzgg4vb791k5dryjvznr6mfwfx59vlgabw2n3spysbwvjv2a48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqIE5lZWRzIHRoZSBwYWNrYWdlIHRyYW5zbGF0ZS1zaGVsbCAqKlxuVHJhbnNsYXRpb24gb2YgdGhlIHRleHQgYnkgZGlmZmVyZW50IHRyYW5zbGF0b3JzIChjdXJyZW50bHkgR29vZ2xlLlRyYW5zbGF0ZSwgWWFuZGV4LlRyYW5zbGF0ZSkuXG5TaG9ydGN1dHM6XG5TdXBlcitUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZy5cblN1cGVyK1NoaWZ0K1QgLSBvcGVuIHRyYW5zbGF0b3IgZGlhbG9nIGFuZCB0cmFuc2xhdGUgdGV4dCBmcm9tIGNsaXBib2FyZC5cblN1cGVyK0FsdCtUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZyBhbmQgdHJhbnNsYXRlIGZyb20gcHJpbWFyeSBzZWxlY3Rpb24uXG5DdHJsK0VudGVyKyAtIFRyYW5zbGF0ZSB0ZXh0LlxuQ3RybCtTaGlmdCtDIC0gY29weSB0cmFuc2xhdGVkIHRleHQgdG8gY2xpcGJvYXJkLlxuQ3RybCtTIC0gc3dhcCBsYW5ndWFnZXMuXG5DdHJsK0QgLSByZXNldCBsYW5ndWFnZXMgdG8gZGVmYXVsdFxuVGFiKyAtIHRvZ2dsZSB0cmFuc2xpdGVyYXRpb24gb2YgcmVzdWx0IHRleHQuIiwKICAibmFtZSI6ICJUZXh0IFRyYW5zbGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGV4dC10cmFuc2xhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Vmb2UvdGV4dC10cmFuc2xhdG9yIiwKICAidXVpZCI6ICJ0ZXh0X3RyYW5zbGF0b3JAYXdhbXBlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} @@ -148,7 +148,7 @@ , {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers. Required package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "1q2k5b4z159nfr5mn4ah8fz9x8dq35x5sz99s8yhalbkb0ba0d1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "43": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} , {"uuid": "move-osd-windows@maestroschan.fr", "name": "Move OSD Windows", "pname": "move-osd-windows", "description": "Change the position of OSD windows (sound & luminosity popups).", "link": "https://extensions.gnome.org/extension/1220/move-osd-windows/", "shell_version_map": {"38": {"version": "3", "sha256": "1nmvbx7qbr9a9al5wirnsfwn4qb1qbql2w9f7fpajipasill9hkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgcG9zaXRpb24gb2YgT1NEIHdpbmRvd3MgKHNvdW5kICYgbHVtaW5vc2l0eSBwb3B1cHMpLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1vdmUtb3NkLXdpbmRvd3MiLAogICJuYW1lIjogIk1vdmUgT1NEIFdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWVzdHJvc2NoYW4vTW92ZS1PU0QtV2luZG93cy1HTk9NRS1FeHRlbnNpb24iLAogICJ1dWlkIjogIm1vdmUtb3NkLXdpbmRvd3NAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "arc-menu@linxgem33.com", "name": "Arc Menu", "pname": "arc-menu", "description": "## Unmaintained Project ##\n\nThis project and all related repositories have been officially archived. \n\nKind Regards - LinxGem33 (Andy C)", "link": "https://extensions.gnome.org/extension/1228/arc-menu/", "shell_version_map": {"38": {"version": "49", "sha256": "1h2ry7vf024kq3rxgvv09d08iq7wxrb9xm1qvl126ppq6x15sgr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIFVubWFpbnRhaW5lZCBQcm9qZWN0ICMjXG5cblRoaXMgcHJvamVjdCBhbmQgYWxsIHJlbGF0ZWQgcmVwb3NpdG9yaWVzIGhhdmUgYmVlbiBvZmZpY2lhbGx5IGFyY2hpdmVkLiBcblxuS2luZCBSZWdhcmRzIC0gTGlueEdlbTMzIChBbmR5IEMpIiwKICAiZXh0ZW5zaW9uLWlkIjogImFyYy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjLW1lbnUiLAogICJuYW1lIjogIkFyYyBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyYy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0FyYy1NZW51IiwKICAidXVpZCI6ICJhcmMtbWVudUBsaW54Z2VtMzMuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}}} -, {"uuid": "GmailMessageTray@shuming0207.gmail.com", "name": "Gnome Email Notifications", "pname": "gmail-message-tray", "description": "Shows Gmail and Outlook notifications in Gnome Message Tray using Gnome Online Accounts\n", "link": "https://extensions.gnome.org/extension/1230/gmail-message-tray/", "shell_version_map": {"40": {"version": "22", "sha256": "1hsjqhm0gb7iisg3drwyav166w8zvbfbsdwr47v997xf4mfaycbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "24", "sha256": "0vldilmp2vzfl99fw0ainnlj9sz0a95zjlqnzybsz7dasin39i9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "25", "sha256": "0qvyhmdivl3wgg1qzmh7r6fci3j0fj6dwm0bspvwjg6mj8fbgj14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "GmailMessageTray@shuming0207.gmail.com", "name": "Gnome Email Notifications", "pname": "gmail-message-tray", "description": "Shows Gmail and Outlook notifications in Gnome Message Tray using Gnome Online Accounts\n", "link": "https://extensions.gnome.org/extension/1230/gmail-message-tray/", "shell_version_map": {"40": {"version": "22", "sha256": "1hsjqhm0gb7iisg3drwyav166w8zvbfbsdwr47v997xf4mfaycbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "24", "sha256": "0vldilmp2vzfl99fw0ainnlj9sz0a95zjlqnzybsz7dasin39i9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "25", "sha256": "0qvyhmdivl3wgg1qzmh7r6fci3j0fj6dwm0bspvwjg6mj8fbgj14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "26", "sha256": "1r14i6q8ijfa2grfq21gfm2mlkh0l0m3a3555pkdgwrhqf6xlkmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "switchWorkSpace@sun.wxg@gmail.com", "name": "Switch Workspace", "pname": "switch-workspace", "description": "Switch workspace like using ALT+TAB key to switch windows \n\n Default shortcut key to switch workspace is Ctrl+Above_Tab .", "link": "https://extensions.gnome.org/extension/1231/switch-workspace/", "shell_version_map": {"38": {"version": "30", "sha256": "1z6dafy981y2kjbnk9dncnkkpgqk45njbh3k08s3jg385qvfryvg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h3b3Jrc3BhY2UiLAogICJ1dWlkIjogInN3aXRjaFdvcmtTcGFjZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "40": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "41": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "42": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "43": {"version": "35", "sha256": "08jjqfmb2y067lig8xkamrmzxyvxqpd2bdqykxsb98i8mzgwb2d4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3dpdGNod29ya3NwYWNlIiwKICAidXVpZCI6ICJzd2l0Y2hXb3JrU3BhY2VAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Removes the 'Windows is ready' notification and puts the window into focus.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {"38": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {"38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} @@ -171,7 +171,7 @@ , {"uuid": "disableworkspaceanim@owilliams.mixxx.org", "name": "Disable Workspace Switch Animation", "pname": "disable-workspace-switch-animation", "description": "Makes switching between workspaces instant without disabling other animations", "link": "https://extensions.gnome.org/extension/1328/disable-workspace-switch-animation/", "shell_version_map": {"38": {"version": "4", "sha256": "0yy5yddzaswfl5yv19layls3g2nwfj47x5zg131f43y7abgp7z4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRpc2FibGV3b3Jrc3BhY2VhbmltQG93aWxsaWFtcy5taXh4eC5vcmciLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "5", "sha256": "1w7gxcgz5729vwfw3ih2ha4y3r07cgqh1kykqfnrhraqrjd4zvfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZXdvcmtzcGFjZWFuaW1Ab3dpbGxpYW1zLm1peHh4Lm9yZyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1w7gxcgz5729vwfw3ih2ha4y3r07cgqh1kykqfnrhraqrjd4zvfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZXdvcmtzcGFjZWFuaW1Ab3dpbGxpYW1zLm1peHh4Lm9yZyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "app-switcher_current_workspace_first@fawtytoo", "name": "App-Switcher Current Workspace First", "pname": "app-switcher-current-workspace-first", "description": "App-Switcher modification that sorts applications by current workspace first. It separates apps into 2 separate icons if the app also has windows on other workspaces.\n\nNOTE: The App Switcher is invoked by a keyboard shortcut which you can set in Gnome Settings > Navigation > Switch applications", "link": "https://extensions.gnome.org/extension/1329/app-switcher-current-workspace-first/", "shell_version_map": {"38": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "0lgfv3sba1hhn7s45yjc2snljjc2njysnjjjmra765jhb4z1gbyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "window-switcher_current_workspace_first@fawtytoo", "name": "Window-Switcher Current Workspace First", "pname": "window-switcher-current-workspace-first", "description": "Window-Switcher modification that sorts windows by current workspace first. The other windows are added according to their workspace.\n\nNOTE: The Window Switcher is invoked by a keyboard shortcut which you can set in Gnome Settings > Navigation > Switch windows", "link": "https://extensions.gnome.org/extension/1330/window-switcher-current-workspace-first/", "shell_version_map": {"38": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "1rgy8595hd9xclgkrc2l33yvidypycw67shg881qanf3rs4l2zgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyX2N1cnJlbnRfd29ya3NwYWNlX2ZpcnN0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} -, {"uuid": "run-or-raise@edvard.cz", "name": "Run or raise", "pname": "run-or-raise", "description": "Launch or focus the window or define custom shortcuts in a text file", "link": "https://extensions.gnome.org/extension/1336/run-or-raise/", "shell_version_map": {"38": {"version": "17", "sha256": "0gy12njkdz697zc8mnwj453r6806rq11c300wv47xxaqd5mhiz9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "1v8ij7y3z3j22x6g6p3py0bx1z89k6hlzbchrgvrknpxh4r9fbz4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} +, {"uuid": "run-or-raise@edvard.cz", "name": "Run or raise", "pname": "run-or-raise", "description": "Launch or focus the window or define custom shortcuts in a text file", "link": "https://extensions.gnome.org/extension/1336/run-or-raise/", "shell_version_map": {"38": {"version": "17", "sha256": "0gy12njkdz697zc8mnwj453r6806rq11c300wv47xxaqd5mhiz9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "28", "sha256": "11qrnqz9lydix9i8jfw4g5944k0z3lwrikb7q6hafr3r7l6zb6qw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "11qrnqz9lydix9i8jfw4g5944k0z3lwrikb7q6hafr3r7l6zb6qw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "11qrnqz9lydix9i8jfw4g5944k0z3lwrikb7q6hafr3r7l6zb6qw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "43": {"version": "28", "sha256": "11qrnqz9lydix9i8jfw4g5944k0z3lwrikb7q6hafr3r7l6zb6qw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "show_applications_instead_of_overview@fawtytoo", "name": "Show Applications Instead Of Workspaces", "pname": "show-applications-instead-of-overview", "description": "The Overview will show Applications instead of Workspaces when invoked.", "link": "https://extensions.gnome.org/extension/1337/show-applications-instead-of-overview/", "shell_version_map": {"38": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0dj704fq6g8jfl13gkfljyq360s6in77vd61w8ds8azysarmaww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hvd19hcHBsaWNhdGlvbnNfaW5zdGVhZF9vZl9vdmVydmlld0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "hplip-menu@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip", "pname": "hplip-menu", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.", "link": "https://extensions.gnome.org/extension/1339/hplip-menu/", "shell_version_map": {"38": {"version": "11", "sha256": "1754xb6mn0jbkizm79kyjwbhyf1yld0jw8blddia9fn4s223j2rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImhwbGlwLW1lbnVAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1754xb6mn0jbkizm79kyjwbhyf1yld0jw8blddia9fn4s223j2rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImhwbGlwLW1lbnVAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "notes@maestroschan.fr", "name": "Notes", "pname": "notes", "description": "Sticky notes for the GNOME Shell desktop.", "link": "https://extensions.gnome.org/extension/1357/notes/", "shell_version_map": {"38": {"version": "22", "sha256": "0svx60711cphswiigd1sswczk17cjxr7gr3davk4krkhya04llp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} @@ -183,7 +183,7 @@ , {"uuid": "NotificationCounter@coolllsk", "name": "Notification Counter", "pname": "notification-counter", "description": "Shows number of notifications in queue.", "link": "https://extensions.gnome.org/extension/1386/notification-counter/", "shell_version_map": {"40": {"version": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "04bh9yawzznin0rmy1zr3xgr38b5c080a1xcqlcx8ldzifgpsd39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92a3JpemFuL05vdGlmaWNhdGlvbkNvdW50ZXIiLAogICJ1dWlkIjogIk5vdGlmaWNhdGlvbkNvdW50ZXJAY29vbGxsc2siLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "you2ber@konkor", "name": "you2ber", "pname": "you2ber", "description": "Gnome Youtube Downloader\n\n Simple helper for youtube-dl project. It allows you to save locally desired media content without any browser extensions. Just copy URL address of a media content to the clipboard and select desired quality profile or custom format for the item in the extension menu to store it.\n * Required the installation of ffmpeg (youtube-dl dependency for media manipulation)\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1392/you2ber/", "shell_version_map": {"40": {"version": "10", "sha256": "0dx5x22imwagx2j07xnayvd7zgsk7cyby7gh4jl935ndxmdp05fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFlvdXR1YmUgRG93bmxvYWRlclxuXG4gU2ltcGxlIGhlbHBlciBmb3IgeW91dHViZS1kbCBwcm9qZWN0LiBJdCBhbGxvd3MgeW91IHRvIHNhdmUgbG9jYWxseSBkZXNpcmVkIG1lZGlhIGNvbnRlbnQgd2l0aG91dCBhbnkgYnJvd3NlciBleHRlbnNpb25zLiBKdXN0IGNvcHkgVVJMIGFkZHJlc3Mgb2YgYSBtZWRpYSBjb250ZW50IHRvIHRoZSBjbGlwYm9hcmQgYW5kIHNlbGVjdCBkZXNpcmVkIHF1YWxpdHkgcHJvZmlsZSBvciBjdXN0b20gZm9ybWF0IGZvciB0aGUgaXRlbSBpbiB0aGUgZXh0ZW5zaW9uIG1lbnUgdG8gc3RvcmUgaXQuXG4gKiBSZXF1aXJlZCB0aGUgaW5zdGFsbGF0aW9uIG9mIGZmbXBlZyAoeW91dHViZS1kbCBkZXBlbmRlbmN5IGZvciBtZWRpYSBtYW5pcHVsYXRpb24pXG5cbkZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCBob3ctdG8gc2VlIFJFQURNRS5tZCIsCiAgIm5hbWUiOiAieW91MmJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcua29ua29yLnlvdTJiZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL3lvdTJiZXIiLAogICJ1dWlkIjogInlvdTJiZXJAa29ua29yIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "files-view@argonauta.framagit.org", "name": "Files View", "pname": "files-view", "description": "", "link": "https://extensions.gnome.org/extension/1395/files-view/", "shell_version_map": {"38": {"version": "11", "sha256": "0367kzrpzbx1b2l1m68n2pmazlsy4207a1anvyr2n1a4xpq3vwb0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgImdldHRleHQtZG9tYWluIjogImZpbGVzLXZpZXciLAogICJuYW1lIjogIkZpbGVzIFZpZXciLAogICJyZWNlbnRseS1vcGVuLXBlcnNpc3RlbnQtZmlsZW5hbWUiOiAicmVjZW50bHktb3Blbi1mb2xkZXJzLWZpbGVzLXZpZXctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLmpzb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmlsZXMtdmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJmaWxlcy12aWV3QGFyZ29uYXV0YS5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} -, {"uuid": "bluetooth-quick-connect@bjarosze.gmail.com", "name": "Bluetooth Quick Connect", "pname": "bluetooth-quick-connect", "description": "Allow to connect to paired devices from gnome control panel.\n", "link": "https://extensions.gnome.org/extension/1401/bluetooth-quick-connect/", "shell_version_map": {"38": {"version": "16", "sha256": "1fkx12xx1m8pchyfvq0vmyd21m79s9s0jw4ackqg1nqcpwyqd1c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmphcm9zemUvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "30", "sha256": "1sirfmi5dny4lcim6psib5ik5ynvhmms1r7rd5lndx8spv3wgh3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} +, {"uuid": "bluetooth-quick-connect@bjarosze.gmail.com", "name": "Bluetooth Quick Connect", "pname": "bluetooth-quick-connect", "description": "Allow to connect to paired devices from gnome control panel.\n", "link": "https://extensions.gnome.org/extension/1401/bluetooth-quick-connect/", "shell_version_map": {"38": {"version": "16", "sha256": "1fkx12xx1m8pchyfvq0vmyd21m79s9s0jw4ackqg1nqcpwyqd1c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmphcm9zemUvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "32", "sha256": "065q3laq809bnplfvvhdx8kaypvrs3s4n4h4zzb0sr5pp0ljlaxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "41": {"version": "32", "sha256": "065q3laq809bnplfvvhdx8kaypvrs3s4n4h4zzb0sr5pp0ljlaxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "42": {"version": "32", "sha256": "065q3laq809bnplfvvhdx8kaypvrs3s4n4h4zzb0sr5pp0ljlaxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "43": {"version": "32", "sha256": "065q3laq809bnplfvvhdx8kaypvrs3s4n4h4zzb0sr5pp0ljlaxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}}} , {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": {"38": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator changes brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell. Extension for notebooks/tablets only, default brightness bar must be present in Gnome Shell.", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": {"38": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "quake-mode@repsac-by.github.com", "name": "quake-mode", "pname": "quake-mode", "description": "Drop-down mode for any application", "link": "https://extensions.gnome.org/extension/1411/quake-mode/", "shell_version_map": {"38": {"version": "3", "sha256": "17498v2jw85fhrsldvgnj3x01h00wqarsp9zqp6ym4h7syzbjxrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJuYW1lIjogInF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "04crfzkw1dl52v899axpx7igkhdk0v1b0jrhagd9hvqbcxz9zgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} @@ -203,7 +203,7 @@ , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "rdesktop-menu@bastien.git.geekwu.org", "name": "Rdesktop launcher", "pname": "rdesktop-launcher", "description": "Add a servers status menu for quickly running rdesktop", "link": "https://extensions.gnome.org/extension/1467/rdesktop-launcher/", "shell_version_map": {"38": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "tint-all@amarovita.github.com", "name": "Tint All", "pname": "tint-all", "description": "Colorize the entire gnome workspace. Amber, green, cyan, sepia and grayscale - just keep clicking extension icon. Scroll over extension icon to change fx level.", "link": "https://extensions.gnome.org/extension/1471/tint-all/", "shell_version_map": {"38": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0n6pnkfzwdsafkwf302vg9bvih70mpqvhn25k8l8h5r83x17q41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWJhdGltZSIsCiAgInV1aWQiOiAiYmF0aW1lQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "12", "sha256": "05zhgz2pjd74wryzrjz13k737c26sd271i84dmzygd9l3dyr1pd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1iYXRpbWUiLAogICJ1dWlkIjogImJhdGltZUBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "unlockDialogBackground@sun.wxg@gmail.com", "name": "Lock screen background", "pname": "unlock-dialog-background", "description": "Change lock screen background.\nIf you use Ubuntu, install package gir1.2-clutter-1.0 first.", "link": "https://extensions.gnome.org/extension/1476/unlock-dialog-background/", "shell_version_map": {"38": {"version": "18", "sha256": "1j9m4qkd0i6l4nxwpxjwvp3nh0zifpzvp0xwp4cqqlr2flb6lwps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiMy4zNi40IiwKICAgICIzLjM2LjUiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zNi43IiwKICAgICIzLjM2LjgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "20", "sha256": "1gin7mpafmx8h177alhhlrjqpq5354napc0jqaj4l4f7ynzn4843", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "23", "sha256": "0j4mhrdmkwwsf52lcqbl0ln7rl3s64nb24862gahs26y4kpbaiv3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "27", "sha256": "1kzrm6n8cj9lpxdz4nkdi2g014rbalv1rdwvqpdf7z8wjgf69q7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAidXVpZCI6ICJ1bmxvY2tEaWFsb2dCYWNrZ3JvdW5kQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "43": {"version": "27", "sha256": "1kzrm6n8cj9lpxdz4nkdi2g014rbalv1rdwvqpdf7z8wjgf69q7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmxvY2tEaWFsb2dCYWNrZ3JvdW5kIiwKICAidXVpZCI6ICJ1bmxvY2tEaWFsb2dCYWNrZ3JvdW5kQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "wsmatrix@martin.zurowietz.de", "name": "Workspace Matrix", "pname": "workspace-matrix", "description": "Arrange workspaces in a two dimensional grid with workspace thumbnails.", "link": "https://extensions.gnome.org/extension/1485/workspace-matrix/", "shell_version_map": {"38": {"version": "27", "sha256": "0b76x0li5a8x42l67ykbw34k4cfmbxqvz36zighhfw4qmxsc36cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLXdzbWF0cml4IiwKICAidXVpZCI6ICJ3c21hdHJpeEBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "37", "sha256": "0idw53rxkfjq7wy9z7b13qpcq85sslgvr4rsp3gfxiyar9wdz21g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "43": {"version": "37", "sha256": "0idw53rxkfjq7wy9z7b13qpcq85sslgvr4rsp3gfxiyar9wdz21g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Syncs gnome-shell keybindings, tweaks settings and extensions with their configuration across all gnome installations", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "1gxjbxbfk2xkbpfc5yv38najmixxsz34g5p6y3rmi6ly5kgca798", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "17", "sha256": "112qqwa5smms0k2ki8d3qwpzf17y6sw2lgpz4ibi57zja0y3plgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "112qqwa5smms0k2ki8d3qwpzf17y6sw2lgpz4ibi57zja0y3plgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29hZS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLXN5bmMiLAogICJ1dWlkIjogImV4dGVuc2lvbnMtc3luY0BlbGhhbi5pbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "18", "sha256": "1ira1azgc5glm45j0f7jbzj0iyvrkfxymihfcqimr9047mzv79va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1ira1azgc5glm45j0f7jbzj0iyvrkfxymihfcqimr9047mzv79va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNzIGdub21lLXNoZWxsIGtleWJpbmRpbmdzLCB0d2Vha3Mgc2V0dGluZ3MgYW5kIGV4dGVuc2lvbnMgd2l0aCB0aGVpciBjb25maWd1cmF0aW9uIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFsbGF0aW9ucyIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9ucyBTeW5jIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc3luYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} @@ -312,7 +312,7 @@ , {"uuid": "BringOutSubmenuOfPowerOffLogoutButton@pratap.fastmail.fm", "name": "Bring Out Submenu Of Power Off/Logout Button", "pname": "bring-out-submenu-of-power-offlogout-button", "description": "Bring Out Submenu Of Power Off/Logout Button and Rearrange the Order of System Menu.", "link": "https://extensions.gnome.org/extension/2917/bring-out-submenu-of-power-offlogout-button/", "shell_version_map": {"38": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "35", "sha256": "1295hf1xgzj6p89k40zz7x4fbdbvm9bkv88ym8f2ibn6080gbx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Show the remaining time until fully charged/discharged as well as percentage of battery charge in the panel.", "link": "https://extensions.gnome.org/extension/2929/battery-time-percentage-compact/", "shell_version_map": {"38": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "executor@raujonas.github.io", "name": "Executor", "pname": "executor", "description": "Execute multiple shell commands periodically with separate intervals and display the output in gnome top bar.", "link": "https://extensions.gnome.org/extension/2932/executor/", "shell_version_map": {"38": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "1kgvn9mg7n7h01l82rsn5b6wq11znb3vg796dw6xpqbkmrf282kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1am9uYXMvZXhlY3V0b3IiLAogICJ1dWlkIjogImV4ZWN1dG9yQHJhdWpvbmFzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lock Screen", "pname": "control-blur-effect-on-lock-screen", "description": "Control the Blur Effect On Lock Screen.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {"38": {"version": "14", "sha256": "176qxx2zykzzjq2xf8sf1c83r1skaxa2mzmp51v8bq3vbbxp0wij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "42": {"version": "18", "sha256": "0wxyfkd9nyrnxzlcp1sp0kb2q0zsjnhs5s0lgg85rnn72x8wnnbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} +, {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lock Screen", "pname": "control-blur-effect-on-lock-screen", "description": "Control the Blur Effect On Lock Screen.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {"38": {"version": "14", "sha256": "176qxx2zykzzjq2xf8sf1c83r1skaxa2mzmp51v8bq3vbbxp0wij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "compiz-alike-windows-effect@hermes83.github.com", "name": "Compiz alike windows effect", "pname": "compiz-alike-windows-effect", "description": "Wobbly windows effect inspired by the Compiz ones\n\nNB\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n ALTERNATIVE\n-----------------------------------\nalternative extension to obtain an effect more similar to the original:\nhttps://extensions.gnome.org/extension/3210/compiz-windows-effect/", "link": "https://extensions.gnome.org/extension/2950/compiz-alike-windows-effect/", "shell_version_map": {"38": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "light-dict@tuberry.github.io", "name": "Light Dict", "pname": "light-dict", "description": "Lightweight extension for on-the-fly manipulation to primary selections, especially optimized for Dictionary lookups.\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2959/light-dict/", "shell_version_map": {"38": {"version": "47", "sha256": "1l36l9qmcz7c6i81w5fv083bg01qsgz681c2lan8f87hqdipl4r7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsaWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2xpZ2h0LWRpY3QiLAogICJ1dWlkIjogImxpZ2h0LWRpY3RAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "40": {"version": "58", "sha256": "0x3rk3p2vlyd2n23jlmwqfc1akbbjfhyn9w1v44byw1nfc3b0n8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"}, "41": {"version": "65", "sha256": "1hjaw62pxrpgismg6dhxqp04qhk1d4xkwlgzymmra7d428qjnxf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2NQp9"}, "42": {"version": "67", "sha256": "05nxmlsik60nmci7x1zvdfwjymab10ikb4pdgq4cmpim3mrpp3xn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Nwp9"}, "43": {"version": "71", "sha256": "15wh8s5yllgrf4aj2zz9vd2hyqjhys5md2lmlmh7nrhy87j1bi1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3MQp9"}}} , {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "11", "sha256": "1y33l24q441nc147njjp4ylygmfr73br8adc8yfbp9p8dzh084f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "0psypjrg31303rd9l7i18y11vg7k905w36p2zlhmr5gmlklpma9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} @@ -374,12 +374,12 @@ , {"uuid": "azan@hatem.masmoudi.org", "name": "Azan Islamic Prayer Times", "pname": "azan-islamic-prayer-times", "description": "Azan is an Islamic prayer times extension for Gnome Shell based on the extension by Fahrinh.\n\nFeatures\n- List compulsory prayer times\n Optionally display Imsak, Sunrise, Sunset and Midnight\n- Show remaining time for the upcoming prayer.\n- Show current date in Hijri calendar.\n- Display a notification when it's time for prayer.\n- Automatic Geoclue2 location detection\n- Show times in 24 hour and 12 hour formats\n- Hijri date adjusment\n- Moon status icon", "link": "https://extensions.gnome.org/extension/3602/azan-islamic-prayer-times/", "shell_version_map": {"38": {"version": "2", "sha256": "1z58m1w04mdddq9p3102jv852zks41f2l7xbx7j8jcljy4ahiqll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF6YW4gaXMgYW4gSXNsYW1pYyBwcmF5ZXIgdGltZXMgZXh0ZW5zaW9uIGZvciBHbm9tZSBTaGVsbCBiYXNlZCBvbiB0aGUgZXh0ZW5zaW9uIGJ5IEZhaHJpbmguXG5cbkZlYXR1cmVzXG4tIExpc3QgY29tcHVsc29yeSBwcmF5ZXIgdGltZXNcbiBPcHRpb25hbGx5IGRpc3BsYXkgSW1zYWssIFN1bnJpc2UsIFN1bnNldCBhbmQgTWlkbmlnaHRcbi0gU2hvdyByZW1haW5pbmcgdGltZSBmb3IgdGhlIHVwY29taW5nIHByYXllci5cbi0gU2hvdyBjdXJyZW50IGRhdGUgaW4gSGlqcmkgY2FsZW5kYXIuXG4tIERpc3BsYXkgYSBub3RpZmljYXRpb24gd2hlbiBpdCdzIHRpbWUgZm9yIHByYXllci5cbi0gQXV0b21hdGljIEdlb2NsdWUyIGxvY2F0aW9uIGRldGVjdGlvblxuLSBTaG93IHRpbWVzIGluIDI0IGhvdXIgYW5kIDEyIGhvdXIgZm9ybWF0c1xuLSBIaWpyaSBkYXRlIGFkanVzbWVudFxuLSBNb29uIHN0YXR1cyBpY29uIiwKICAibmFtZSI6ICJBemFuIElzbGFtaWMgUHJheWVyIFRpbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF6YW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vaG1hc21vdWRpL2F6YW4tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhemFuQGhhdGVtLm1hc21vdWRpLm9yZyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "blur-provider@corvettecole.github.com", "name": "blur-provider", "pname": "blur-provider", "description": "Provides an easy way for applications to request blur, and allows users to set blur on applications", "link": "https://extensions.gnome.org/extension/3607/blur-provider/", "shell_version_map": {"38": {"version": "2", "sha256": "1p0cyq1bfi18ysk1fvydjvk6qdl87qi9p3kpc165q5i0d4b41ffp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGFuIGVhc3kgd2F5IGZvciBhcHBsaWNhdGlvbnMgdG8gcmVxdWVzdCBibHVyLCBhbmQgYWxsb3dzIHVzZXJzIHRvIHNldCBibHVyIG9uIGFwcGxpY2F0aW9ucyIsCiAgImV4dGVuc2lvbi1pZCI6ICJibHVyLXByb3ZpZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiYmx1ci1wcm92aWRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29ydmV0dGVjb2xlL2JsdXItcHJvdmlkZXIiLAogICJ1dWlkIjogImJsdXItcHJvdmlkZXJAY29ydmV0dGVjb2xlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "wireguard-indicator@atareao.es", "name": "WireGuard Indicator", "pname": "wireguard-indicator", "description": "Manage WireGuard VPN from Desktop", "link": "https://extensions.gnome.org/extension/3612/wireguard-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "058sqbzj2is7n6j8nrf23n6g5mxi1agwmdfv2q8lwmi444bl8xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vd2lyZWd1YXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAid2lyZWd1YXJkLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "shamsi-calendar@gnome.scr.ir", "name": "Iranian Persian Calendar", "pname": "shamsi-calendar", "description": "تقویم هجری شمسی،قمری و میلادی در میز‌کار گنوم لینوکس\nقابلیت نمایش اوقات شرعی و پخش اذان\nدرج تعطیلی‌ها و مناسبت‌های رسمی تقویم\nزبان کاملاً فارسی\nتاریخ قمری هلالی ایران\nسازگار با اکثر نسخه‌های گنوم\nدر حال توسعه...\n\nShows Persian + Islamic + Gregorian date in the panel of gnome.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri(Islamic)\n5- Show calendar Events.\n6- Show PrayTimes and play sound (Azan).\n\nPlease \"rate\" here and \"star\" project in GitHub.\nPlease open an issue in GitHub if you found something or have an idea!\nگزارش مشکلات:\nhttps://github.com/SCR-IR/gnome-shamsi-calendar/issues", "link": "https://extensions.gnome.org/extension/3618/shamsi-calendar/", "shell_version_map": {"38": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}, "43": {"version": "24", "sha256": "0009g7p694iqff89d5rrcgcvlbhzylg4yy0879lk6cwjib8l77d7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNAp9"}}} +, {"uuid": "shamsi-calendar@gnome.scr.ir", "name": "Iranian Persian Calendar", "pname": "shamsi-calendar", "description": "تقویم هجری شمسی،قمری و میلادی در میز‌کار گنوم لینوکس\nقابلیت نمایش اوقات شرعی و پخش اذان\nدرج تعطیلی‌ها و مناسبت‌های رسمی تقویم\nزبان کاملاً فارسی\nتاریخ قمری هلالی ایران\nسازگار با اکثر نسخه‌های گنوم\nدر حال توسعه...\n\nShows Persian + Islamic + Gregorian date in the panel of gnome.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri(Islamic)\n5- Show calendar Events.\n6- Show PrayTimes and play sound (Azan).\n\nPlease \"rate\" here and \"star\" project in GitHub.\nPlease open an issue in GitHub if you found something or have an idea!\nگزارش مشکلات:\nhttps://github.com/SCR-IR/gnome-shamsi-calendar/issues", "link": "https://extensions.gnome.org/extension/3618/shamsi-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "tunnel-indicator@atareao.es", "name": "Tunnel Indicator", "pname": "tunnel-indicator", "description": "Manage SSH Tunnels from Desktop", "link": "https://extensions.gnome.org/extension/3622/tunnel-indicator/", "shell_version_map": {"40": {"version": "2", "sha256": "0ma4a711mgjxyhy4d21p2m7wvbnmmwlfdsf6xk9i36ranjcqs9as", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBTU0ggVHVubmVscyBmcm9tIERlc2t0b3AiLAogICJleHRlbnNpb24taWQiOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0dW5uZWwtaWNvbiIsCiAgIm5hbWUiOiAiVHVubmVsIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnR1bm5lbC1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby90dW5uZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0dW5uZWwtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application menu for GNOME Shell\n\nFeatures include: various menu layouts, built in GNOME search, quick access to system shortcuts, and much more!\n\nCommon solutions for ERROR message:\n - Restart your GNOME session after updating ArcMenu.\n - Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n - Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "13", "sha256": "1sqsj5vj234c53m508wa2zxjkqnf1pcgm6iqmj2k33dq7h75nhlw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "01h4r7alddj1fly4l4rxpji17ilmf0v56559rdnsl0sy1lx8bkrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "18dqnr0jsi7crkmd03vdywkhmkkd0zwf5bq7p0kkgg27cmbgx6dy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIG1lbnUgZm9yIEdOT01FIFNoZWxsXG5cbkZlYXR1cmVzIGluY2x1ZGU6IHZhcmlvdXMgbWVudSBsYXlvdXRzLCBidWlsdCBpbiBHTk9NRSBzZWFyY2gsIHF1aWNrIGFjY2VzcyB0byBzeXN0ZW0gc2hvcnRjdXRzLCBhbmQgbXVjaCBtb3JlIVxuXG5Db21tb24gc29sdXRpb25zIGZvciBFUlJPUiBtZXNzYWdlOlxuIC0gUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbiAtIEluc3RhbGwgb25lIG9mIHRoZSBmb2xsb3dpbmcgcGFja2FnZXM6ICdnaXIxLjItZ21lbnUtMy4wJyBvciAnZ25vbWUtbWVudXMnXG5cbkdlbmVyYWwgSGVscDpcbiAtIFZpc2l0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUvLS93aWtpcy9ob21lXG5cblBsZWFzZSByZXBvcnQgYWxsIGJ1Z3Mgb3IgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJleHRlbnNpb24taWQiOiAiYXJjbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyY21lbnUiLAogICJuYW1lIjogIkFyY01lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXJjbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Make the IME list in fixed sequence instead of MRU.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {"38": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "18z9h0fcq6w3kmcc5v8swjn18nc9hkck54jfzyv2697py6cd83kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "topindicatorapp@quiro9.com", "name": "Top Indicator App", "pname": "top-indicator-app", "description": "This extension is 'appindicators' from ubuntu, renamed 'top indicator app' under the terms of the GPL v2 +. it is the extension itself that Ubuntu offers as a native experience on your system, but so you can install it in other distros since the current one in gnome-extensions is empty.I will offer stable updates when possible.", "link": "https://extensions.gnome.org/extension/3681/top-indicator-app/", "shell_version_map": {"38": {"version": "2", "sha256": "12r4fxgsgd7jn001vlzqrsd86ci62zxk0b9p3bkdqh6g5hj3la35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzICdhcHBpbmRpY2F0b3JzJyBmcm9tIHVidW50dSwgcmVuYW1lZCAndG9wIGluZGljYXRvciBhcHAnIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR1BMIHYyICsuIGl0IGlzIHRoZSBleHRlbnNpb24gaXRzZWxmIHRoYXQgVWJ1bnR1IG9mZmVycyBhcyBhIG5hdGl2ZSBleHBlcmllbmNlIG9uIHlvdXIgc3lzdGVtLCBidXQgc28geW91IGNhbiBpbnN0YWxsIGl0IGluIG90aGVyIGRpc3Ryb3Mgc2luY2UgdGhlIGN1cnJlbnQgb25lIGluIGdub21lLWV4dGVuc2lvbnMgaXMgZW1wdHkuSSB3aWxsIG9mZmVyIHN0YWJsZSB1cGRhdGVzIHdoZW4gcG9zc2libGUuIiwKICAibmFtZSI6ICJUb3AgSW5kaWNhdG9yIEFwcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0b3BpbmRpY2F0b3JhcHBAcXVpcm85LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "reorder-workspaces@jer.dev", "name": "Reorder Workspaces", "pname": "reorder-workspaces", "description": "Reorder workspaces in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "15", "sha256": "0i23jb0piamykqypavaviwlwvb44dw4jda6zmqqz3dlgkqjbrigm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "0i23jb0piamykqypavaviwlwvb44dw4jda6zmqqz3dlgkqjbrigm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "reorder-workspaces@jer.dev", "name": "Reorder Workspaces", "pname": "reorder-workspaces", "description": "Reorder workspaces in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0l4ivdbhsnpmr2bngqrzmybal6i1ni85dlpd5ir0dafd95yl7y04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "16", "sha256": "0csx3bn90irjv11yc5dw4xhysssc1nkjg0skmpfvqm33lwi461x9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "43": {"version": "16", "sha256": "0csx3bn90irjv11yc5dw4xhysssc1nkjg0skmpfvqm33lwi461x9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NtbXIwL2dub21lLXJlb3JkZXItd29ya3NwYWNlcyIsCiAgInV1aWQiOiAicmVvcmRlci13b3Jrc3BhY2VzQGplci5kZXYiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "eos-hack@endlessos.org", "name": "Hack", "pname": "hack", "description": "Add the Flip to Hack experience to the desktop", "link": "https://extensions.gnome.org/extension/3690/hack/", "shell_version_map": {"38": {"version": "11", "sha256": "1m45rylhv1lw7vh8zmpsfcs1fiv0ah770gk14x965mkalqgph2ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "desktop-scroller@calango", "name": "Desktop Scroller (GNOME 3.38)", "pname": "desktop-scroller-gnome-338", "description": "Switch between desktops scrolling at the upper edge of the screen, including in overview. Change your delay between scroll events in extension.js. If you want to scroll on more lines from the top of the screen just remember that other extensions or indicators will not be able to catch their scroll events.", "link": "https://extensions.gnome.org/extension/3709/desktop-scroller-gnome-338/", "shell_version_map": {"38": {"version": "1", "sha256": "11g4w7bbzb8p9w78w83jpslgbs74rc26np0b1v35dg7nc7x33q4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIGRlc2t0b3BzIHNjcm9sbGluZyBhdCB0aGUgdXBwZXIgZWRnZSBvZiB0aGUgc2NyZWVuLCBpbmNsdWRpbmcgaW4gb3ZlcnZpZXcuIENoYW5nZSB5b3VyIGRlbGF5IGJldHdlZW4gc2Nyb2xsIGV2ZW50cyBpbiBleHRlbnNpb24uanMuIElmIHlvdSB3YW50IHRvIHNjcm9sbCBvbiBtb3JlIGxpbmVzIGZyb20gdGhlIHRvcCBvZiB0aGUgc2NyZWVuIGp1c3QgcmVtZW1iZXIgdGhhdCBvdGhlciBleHRlbnNpb25zIG9yIGluZGljYXRvcnMgd2lsbCBub3QgYmUgYWJsZSB0byBjYXRjaCB0aGVpciBzY3JvbGwgZXZlbnRzLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBTY3JvbGxlciAoR05PTUUgMy4zOCkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJkZXNrdG9wLXNjcm9sbGVyQGNhbGFuZ28iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "appmenu-color-icon@yanbab.gitlab.com", "name": "Colored AppMenu Icon", "pname": "color-app-menu-icon", "description": "Replace the symbolic application menu icon with the colored one", "link": "https://extensions.gnome.org/extension/3712/color-app-menu-icon/", "shell_version_map": {"38": {"version": "1", "sha256": "17bsnqimkanf6c3d3qjvhggi5r3xjp6pha05fyh6b1ak9m9lvg53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSBjb2xvcmVkIG9uZSIsCiAgIm5hbWUiOiAiQ29sb3JlZCBBcHBNZW51IEljb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS95YW5iYWIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJlZ3VsYXItYXBwbWVudS1pY29uIiwKICAidXVpZCI6ICJhcHBtZW51LWNvbG9yLWljb25AeWFuYmFiLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -390,7 +390,7 @@ , {"uuid": "floating-dock@nandoferreira_prof@hotmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "A Custom Floating Dock fork, now you can change the margin and border radius of the dock.", "link": "https://extensions.gnome.org/extension/3730/floating-dock/", "shell_version_map": {"38": {"version": "1", "sha256": "0giksm5fvrj412v8xnf2hi4s0yi2mqd9prd84npv8jxkfv78y414", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm5hbmRvZmVycmVpcmFfcHJvZkBob3RtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "tiling-assistant@leleat-on-github", "name": "Tiling Assistant", "pname": "tiling-assistant", "description": "Expand GNOME's 2 column tiling and add a Windows-snap-assist-inspired popup...", "link": "https://extensions.gnome.org/extension/3733/tiling-assistant/", "shell_version_map": {"38": {"version": "23", "sha256": "1b9hpll26ggwhw4f52wgflzjfqksmyfy5wyg1rpz41lr1dmva8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L1RpbGluZy1Bc3Npc3RhbnQiLAogICJ1dWlkIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "39", "sha256": "1f3mrnp0rdv5j8abbhnwm72gcwgnxzjz2r5p04dp8jqib8lwpf0w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9UaWxpbmctQXNzaXN0YW50IiwKICAidXVpZCI6ICJ0aWxpbmctYXNzaXN0YW50QGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}}} , {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar\n\n/!\\ Needs AirStatus to work: https://github.com/delphiki/AirStatus", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": {"38": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "24", "sha256": "10rc9x685hp35j47ia2lk216997k3lddwjw3x6y9pyf87dhrwbz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "0pf3b6mxipwhqs90r0iqzwl8w92fsz97vnip18r0znqw5pdl4hw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} +, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "24", "sha256": "10rc9x685hp35j47ia2lk216997k3lddwjw3x6y9pyf87dhrwbz7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {"38": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "17b2nxg36v09fc6m5ja0kdi0mnjwid0gama4bg3x5qj87gs5j077", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "latency-monitor@gitlab.labsatho.me", "name": "Latency Monitor", "pname": "latency-monitor", "description": "A simple extension for displaying latency information using pings in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3746/latency-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0k2y1qrq7irkn2c72pk4c5x4fwzaxkfp3jj7qvhzih6zmkifdzcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZGlzcGxheWluZyBsYXRlbmN5IGluZm9ybWF0aW9uIHVzaW5nIHBpbmdzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiTGF0ZW5jeSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdGVuY3ktbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3dhbGthZndhbGthL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sYXRlbmN5LW1vbml0b3IiLAogICJ1dWlkIjogImxhdGVuY3ktbW9uaXRvckBnaXRsYWIubGFic2F0aG8ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "the-circles-widget@xenlism.github.io", "name": "The Circles - Desktop Widget", "pname": "the-circles-desktop-widget", "description": "Show System Infomations on Desktop as Circles Desktop Widget\n\nmore info \nhttps://www.linuxuprising.com/2020/11/display-clock-ram-and-cpu-usage-as.html", "link": "https://extensions.gnome.org/extension/3748/the-circles-desktop-widget/", "shell_version_map": {"38": {"version": "6", "sha256": "0kxync9gdjgcfq3vfhf5z0065n30jw5y5jl00hdgarsh4pkbji04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAidGhlLWNpcmNsZXMtd2lkZ2V0QHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "12", "sha256": "0ngn00y97dqv667z47xahfv53dlb2asm0jbk9harlv4516jdrg0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInRoZS1jaXJjbGVzLXdpZGdldEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} @@ -405,7 +405,7 @@ , {"uuid": "wacom-indicator@fthx", "name": "Wacom Indicator", "pname": "wacom-indicator", "description": "Wacom tablet indicator in the top bar: connection state and power level.\n\n On click: open GNOME Settings Wacom section. On hover or every minute: update connection state and power level.\n\n Settings (in extension.js file headers): show/hide model label, refresh delay, update/do nothing on indicator hover, show/hide if disconnected.", "link": "https://extensions.gnome.org/extension/3809/wacom-indicator/", "shell_version_map": {"38": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hibernate@dafne.rocks", "name": "System Action - Hibernate", "pname": "system-action-hibernate", "description": "A GNOME extension that adds the option to hibernate amongst other system actions", "link": "https://extensions.gnome.org/extension/3814/system-action-hibernate/", "shell_version_map": {"38": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "click-to-close-overview@l3nn4rt.github.io", "name": "Click to close overview", "pname": "click-to-close-overview", "description": "Close the overview by clicking empty space.", "link": "https://extensions.gnome.org/extension/3826/click-to-close-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "17xd3k1xpsn8ma6f11f4sr26y5xbcs3hiw7lv1qqrn80lyjj2vz1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41, 42, 43)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40, 41, 42, 43)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Panel Arrow Visibility (3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36, 3.38, 40, 41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41, 42, 43)\n- System Menu (Aggregate Menu) Visibility (3.36, 3.38, 40, 41, 42)\n- Take Screenshot Button in Window Menu Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon (40, 41, 42, 43)\n- Workspace Background Corner Size in Overview (40, 41, 42, 43)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41, 42, 43)\n- Workspace Switcher Size (40, 41, 42, 43)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "42": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "43": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}}} +, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40-43)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40-43)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36-40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Overview Spacing Size (40-43)\n- Panel Arrow Visibility (3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36-41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status (40-43)\n- Switcher Popup Delay\n- System Menu (Aggregate Menu) Visibility (3.36-42)\n- Take Screenshot Button in Window Menu Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon (40-43)\n- Workspace Background Corner Size in Overview (40-43)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40-43)\n- Workspace Switcher Size (40-43)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "workspaces-bar@fthx", "name": "Workspaces Bar", "pname": "workspaces-bar", "description": "Replace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/3851/workspaces-bar/", "shell_version_map": {"38": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "scanlines-effect@muratcileli.com", "name": "Scanlines Effect", "pname": "scanlines-effect", "description": "Retro monitor / CRT TV effect.", "link": "https://extensions.gnome.org/extension/3860/scanlines-effect/", "shell_version_map": {"38": {"version": "1", "sha256": "1xcsd700s9hkqmrqlv56ldiya2jk0d46j8k4a4i3m9c6k40c5z7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJldHJvIG1vbml0b3IgLyBDUlQgVFYgZWZmZWN0LiIsCiAgIm5hbWUiOiAiU2NhbmxpbmVzIEVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20ubXVyYXRjaWxlbGkuc2NhbmxpbmVzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211cmF0LWNpbGVsaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NhbmxpbmVzLWVmZmVjdCIsCiAgInV1aWQiOiAic2NhbmxpbmVzLWVmZmVjdEBtdXJhdGNpbGVsaS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "workspaces-thumbnails-applet@blogdron", "name": "Workspaces Thumbnails Applet", "pname": "workspaces-thumbnails-applet", "description": "Notice!\n\nThis is a fork of the extension https://extensions.gnome.org/extension/2557/workspaces-thumbnails/ It hasn't been updated in a long time, but it only needs a small fix to work. Until the author fixes the problem, I will keep this fork. Please, if you have the opportunity to contact the author of the original extension, let him fix the problem for himself.\n\n\nPut an indicator on the panel showing all the workspaces thumbnails, allowing to switch between them or moving windows to another workspace.\n\n This is a very tiny fork of the original (GNOME official extension) Workspace Indicator, allowing to use it like when the Horizontal Workspaces extension is activated. The vertical workspaces layout is not modified; the workspaces layout is horizontal only in the top panel and the workspaces switcher in the overview is still showed. Please note that any global bug should be reported against the Workspace Indicator extension. https://extensions.gnome.org/extension/21/workspace-indicator", "link": "https://extensions.gnome.org/extension/3872/workspaces-thumbnails-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "02823b6rfnibb0mhnx848pdxc3birw2aqp8607wjf93mvy5388hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGljZSFcblxuVGhpcyBpcyBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yNTU3L3dvcmtzcGFjZXMtdGh1bWJuYWlscy8gSXQgaGFzbid0IGJlZW4gdXBkYXRlZCBpbiBhIGxvbmcgdGltZSwgYnV0IGl0IG9ubHkgbmVlZHMgYSBzbWFsbCBmaXggdG8gd29yay4gVW50aWwgdGhlIGF1dGhvciBmaXhlcyB0aGUgcHJvYmxlbSwgSSB3aWxsIGtlZXAgdGhpcyBmb3JrLiBQbGVhc2UsIGlmIHlvdSBoYXZlIHRoZSBvcHBvcnR1bml0eSB0byBjb250YWN0IHRoZSBhdXRob3Igb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiwgbGV0IGhpbSBmaXggdGhlIHByb2JsZW0gZm9yIGhpbXNlbGYuXG5cblxuUHV0IGFuIGluZGljYXRvciBvbiB0aGUgcGFuZWwgc2hvd2luZyBhbGwgdGhlIHdvcmtzcGFjZXMgdGh1bWJuYWlscywgYWxsb3dpbmcgdG8gc3dpdGNoIGJldHdlZW4gdGhlbSBvciBtb3Zpbmcgd2luZG93cyB0byBhbm90aGVyIHdvcmtzcGFjZS5cblxuIFRoaXMgaXMgYSB2ZXJ5IHRpbnkgZm9yayBvZiB0aGUgb3JpZ2luYWwgKEdOT01FIG9mZmljaWFsIGV4dGVuc2lvbikgV29ya3NwYWNlIEluZGljYXRvciwgYWxsb3dpbmcgdG8gdXNlIGl0IGxpa2Ugd2hlbiB0aGUgSG9yaXpvbnRhbCBXb3Jrc3BhY2VzIGV4dGVuc2lvbiBpcyBhY3RpdmF0ZWQuIFRoZSB2ZXJ0aWNhbCB3b3Jrc3BhY2VzIGxheW91dCBpcyBub3QgbW9kaWZpZWQ7IHRoZSB3b3Jrc3BhY2VzIGxheW91dCBpcyBob3Jpem9udGFsIG9ubHkgaW4gdGhlIHRvcCBwYW5lbCBhbmQgdGhlIHdvcmtzcGFjZXMgc3dpdGNoZXIgaW4gdGhlIG92ZXJ2aWV3IGlzIHN0aWxsIHNob3dlZC4gUGxlYXNlIG5vdGUgdGhhdCBhbnkgZ2xvYmFsIGJ1ZyBzaG91bGQgYmUgcmVwb3J0ZWQgYWdhaW5zdCB0aGUgV29ya3NwYWNlIEluZGljYXRvciBleHRlbnNpb24uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzIxL3dvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJleHRlbnNpb24taWQiOiAid29ya3NwYWNlcy10aHVtYm5haWxzLWFwcGxldCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldvcmtzcGFjZXMgVGh1bWJuYWlscyBBcHBsZXQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiLAogICAgImJsb2dkcm9uIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtdGh1bWJuYWlscy1hcHBsZXRAYmxvZ2Ryb24iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -506,7 +506,7 @@ , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nNow with preference dialog!\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "gnome-citeurl-search-provider@raindrum.github.io", "name": "Legal Citation Search", "pname": "gnome-citeurl-search-provider", "description": "This extension lets you look up U.S. state and federal laws and court cases by typing citations (like \"42 USC 1983\" or \"U.S. Constitution Art. I, Sec. 3\") into the search bar.\nBy default, the search supports the U.S. Code and federal constitution, as well as nearly all codified state laws and constitutions, among other sources of law. You can also add more types of citation by following the instructions on the GitHub page.", "link": "https://extensions.gnome.org/extension/4225/gnome-citeurl-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "wireless-hid@chlumskyvaclav.gmail.com", "name": "Wireless HID", "pname": "wireless-hid", "description": "This extension shows the battery of the wireless keyboards, mice, and game controllers in percentages and colors. Multiple devices are supported.", "link": "https://extensions.gnome.org/extension/4228/wireless-hid/", "shell_version_map": {"38": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1r0l7jr97q4nghsgldd79prp42wda6z1zpy4ldl9n0a1lxg01c87", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "wireless-hid@chlumskyvaclav.gmail.com", "name": "Wireless HID", "pname": "wireless-hid", "description": "This extension shows the battery of the wireless keyboards, mice, and game controllers in percentages and colors. Multiple devices are supported.", "link": "https://extensions.gnome.org/extension/4228/wireless-hid/", "shell_version_map": {"38": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "arbttstats@gervasioperez.ar", "name": "Arbtt stats", "pname": "arbtt-stats", "description": "Show simple arbtt stats on the panel", "link": "https://extensions.gnome.org/extension/4234/arbtt-stats/", "shell_version_map": {"38": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1aqw1s7r3mk4dk6plx826i9ha478v40l8hld458a1riajxhyv0s3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiQXJidHQgc3RhdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "blur-me@nunchucks", "name": "Blur Me", "pname": "blur-me", "description": "Blur: Applications | Top Panel | Overview | Dash | More!\n\n\nCredit where it's due: Overview and dash blur are based on blur my shell", "link": "https://extensions.gnome.org/extension/4236/blur-me/", "shell_version_map": {"40": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} @@ -533,7 +533,7 @@ , {"uuid": "screendarker@yingshaoxo.github.com", "name": "Screen Darker", "pname": "screen-darker", "description": "Help you do a switch between a darker screen and brighter screen by one click.", "link": "https://extensions.gnome.org/extension/4304/screen-darker/", "shell_version_map": {"38": {"version": "1", "sha256": "1zlncw0y5crq6n0slhq1f9npzvkkcyh0187z88mzycr55nl4rsx8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHAgeW91IGRvIGEgc3dpdGNoIGJldHdlZW4gYSBkYXJrZXIgc2NyZWVuIGFuZCBicmlnaHRlciBzY3JlZW4gYnkgb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2NyZWVuIERhcmtlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbmdzaGFveG8vZ25vbWUtc2hlbGwtc2NyZWVuLWRhcmtlciIsCiAgInV1aWQiOiAic2NyZWVuZGFya2VyQHlpbmdzaGFveG8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "network-stats@gnome.noroadsleft.xyz", "name": "Network Stats", "pname": "network-stats", "description": "Displays internet upload speed, download speed, bandwidth, data usage. \n\n visit github page for instructions, suggestions and feature requests. \n\n ERROR while updating extension ? restart your system or reload gnome shell. Alt + F2 then r + Enter", "link": "https://extensions.gnome.org/extension/4308/network-stats/", "shell_version_map": {"38": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "1910cj3a2wdijsflsalp6mzd66wfpqnamiqj7czdb25hnhxh003d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel.\n\nIMPORTANT! You need to install xscreensaver. For Debian distribution, you can use the following command: sudo apt-get install xscreensaver\n\nThank you for using this extension!", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {"40": {"version": "1", "sha256": "1h436z67sk68jcgjxs6p1wlg3hlim3g8j8lrg9aa92rwangfkdcp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwuXG5cbklNUE9SVEFOVCEgWW91IG5lZWQgdG8gaW5zdGFsbCB4c2NyZWVuc2F2ZXIuIEZvciBEZWJpYW4gZGlzdHJpYnV0aW9uLCB5b3UgY2FuIHVzZSB0aGUgZm9sbG93aW5nIGNvbW1hbmQ6IHN1ZG8gYXB0LWdldCBpbnN0YWxsIHhzY3JlZW5zYXZlclxuXG5UaGFuayB5b3UgZm9yIHVzaW5nIHRoaXMgZXh0ZW5zaW9uISIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbi1sb2NrIiwKICAibmFtZSI6ICJTY3JlZW4gbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYXd5ZXIxMy9zY3JlZW4tbG9jayIsCiAgInV1aWQiOiAic2NyZWVuLWxvY2tAZ2FyY2lhYmFhbWVpcm8uY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "force-show-osk@bruh.ltd", "name": "Force Show OSK", "pname": "force-show-osk", "description": "Show the on-screen keyboard regardless of whether the touch mode is enabled", "link": "https://extensions.gnome.org/extension/4316/force-show-osk/", "shell_version_map": {"40": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "19r7ll9vl0wf2y6yc4zznafav8bi131fv1sq3hhs0v494jn81sji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "force-show-osk@bruh.ltd", "name": "(UNMAINTAINED) Force Show OSK", "pname": "force-show-osk", "description": "Show the on-screen keyboard regardless of whether the touch mode is enabled", "link": "https://extensions.gnome.org/extension/4316/force-show-osk/", "shell_version_map": {"40": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "alt-tab-active-windows@github.com", "name": "Alt-Tab Active Windows", "pname": "alt-tab-active-windows", "description": "Only show active(not minimized) windows on Alt-Tab", "link": "https://extensions.gnome.org/extension/4322/alt-tab-active-windows/", "shell_version_map": {"40": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "1as10k3m66kalwskr3awq0zila7j2n0xyn7nfill2in8kl82nxms", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9ubHkgc2hvdyBhY3RpdmUobm90IG1pbmltaXplZCkgd2luZG93cyBvbiBBbHQtVGFiIiwKICAibmFtZSI6ICJBbHQtVGFiIEFjdGl2ZSBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vYWx0LXRhYi1hY3RpdmUtd2luZG93cyIsCiAgInV1aWQiOiAiYWx0LXRhYi1hY3RpdmUtd2luZG93c0BnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "hide-activities-button@nmingori.gnome-shell-extensions.org", "name": "Hide Activities Button", "pname": "hide-activities-button", "description": "Hide Activities Button on the top panel. For Gnome 40 or 3.6+", "link": "https://extensions.gnome.org/extension/4325/hide-activities-button/", "shell_version_map": {"38": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "apt-shortcuts@rx1310", "name": "Shortcuts for APT", "pname": "shortcuts-for-apt", "description": "A small extension that adds buttons to the panel to check for APT updates through the terminal without entering commands.\n\n", "link": "https://extensions.gnome.org/extension/4328/shortcuts-for-apt/", "shell_version_map": {"38": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}}} @@ -546,7 +546,7 @@ , {"uuid": "nonblockingswitcher@scottworley.com", "name": "Non-Blocking Switcher", "pname": "non-blocking-switcher", "description": "Application switching oughtn't stop all other keyboard shortcuts", "link": "https://extensions.gnome.org/extension/4347/non-blocking-switcher/", "shell_version_map": {"40": {"version": "2", "sha256": "05a59fi1454kxh2q8p5qp3an7ss243v3d67jm37k6xggwd59v5fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIHN3aXRjaGluZyBvdWdodG4ndCBzdG9wIGFsbCBvdGhlciBrZXlib2FyZCBzaG9ydGN1dHMiLAogICJuYW1lIjogIk5vbi1CbG9ja2luZyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9jaHVjay9ub24tYmxvY2tpbmctc3dpdGNoZXIiLAogICJ1dWlkIjogIm5vbmJsb2NraW5nc3dpdGNoZXJAc2NvdHR3b3JsZXkuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "fluoroom-gnome-top-bar@fluoroom.github.com", "name": "fluoroom's Top Bar", "pname": "fluorooms-top-bar", "description": "Persistent top bar based on Gnome's default style, with some modifications.\n\nThis extension makes black background and screen corners persistent and makes buttons round, but it will respect your current theme's fonts, margins and icons.", "link": "https://extensions.gnome.org/extension/4350/fluorooms-top-bar/", "shell_version_map": {"40": {"version": "4", "sha256": "1gm6ijr66nrs4r7cp2ksdy4sppf3vrg88lvf1gs993q6r894li89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNpc3RlbnQgdG9wIGJhciBiYXNlZCBvbiBHbm9tZSdzIGRlZmF1bHQgc3R5bGUsIHdpdGggc29tZSBtb2RpZmljYXRpb25zLlxuXG5UaGlzIGV4dGVuc2lvbiBtYWtlcyBibGFjayBiYWNrZ3JvdW5kIGFuZCBzY3JlZW4gY29ybmVycyBwZXJzaXN0ZW50IGFuZCBtYWtlcyBidXR0b25zIHJvdW5kLCBidXQgaXQgd2lsbCByZXNwZWN0IHlvdXIgY3VycmVudCB0aGVtZSdzIGZvbnRzLCBtYXJnaW5zIGFuZCBpY29ucy4iLAogICJuYW1lIjogImZsdW9yb29tJ3MgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbHVvcm9vbS9mbHVvcm9vbS1nbm9tZS10b3AtYmFyIiwKICAidXVpZCI6ICJmbHVvcm9vbS1nbm9tZS10b3AtYmFyQGZsdW9yb29tLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "mbpbat@prithvivishak.gmail.com", "name": "MacBook Battery Percentage Corrector", "pname": "macbook-battery-percentage-corrector", "description": "Corrects only the battery percentage shown in the panel aggregate menu.\nDoes not mess with UPower or other subsystems. Special thanks to @andenlol.", "link": "https://extensions.gnome.org/extension/4353/macbook-battery-percentage-corrector/", "shell_version_map": {"38": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "143gkzalaqzp1bjydy9dm1mi0k2sql8m77yj57gxb854bbipymqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bGlhbnNjaGFjaGVyL3RvcC1iYXItb3JnYW5pemVyIiwKICAidXVpZCI6ICJ0b3AtYmFyLW9yZ2FuaXplckBqdWxpYW4uZ3NlLmpzdHMueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "143gkzalaqzp1bjydy9dm1mi0k2sql8m77yj57gxb854bbipymqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bGlhbnNjaGFjaGVyL3RvcC1iYXItb3JnYW5pemVyIiwKICAidXVpZCI6ICJ0b3AtYmFyLW9yZ2FuaXplckBqdWxpYW4uZ3NlLmpzdHMueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "7", "sha256": "0nmyagf8b1xzci79vhk13bl61hw50yd40aa0pvd8gcsl2z74s2n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "0nmyagf8b1xzci79vhk13bl61hw50yd40aa0pvd8gcsl2z74s2n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {"38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "nepalidate@kritishdhaubanjar.gmail.com", "name": "Nepali Date", "pname": "nepali-date", "description": "Show Today's Nepali Date", "link": "https://extensions.gnome.org/extension/4366/nepali-date/", "shell_version_map": {"40": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -586,7 +586,7 @@ , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": {"38": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "hide-panel-for-fullscreen-windows-only@github.freder", "name": "Hide panel (only when active window is fullscreen)", "pname": "hide-panel-only-when-active-window-is-fullscreen", "description": "hide top panel only when a fullscreen application has focus", "link": "https://extensions.gnome.org/extension/4475/hide-panel-only-when-active-window-is-fullscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "1hd5agdjq73qiqip0m3grmlxk8klp26pd71cz555414mi3f9mww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGUgdG9wIHBhbmVsIG9ubHkgd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaGFzIGZvY3VzIiwKICAibmFtZSI6ICJIaWRlIHBhbmVsIChvbmx5IHdoZW4gYWN0aXZlIHdpbmRvdyBpcyBmdWxsc2NyZWVuKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZXIvaGlkZS1wYW5lbC1mb3ItZnVsbHNjcmVlbi13aW5kb3dzLW9ubHkiLAogICJ1dWlkIjogImhpZGUtcGFuZWwtZm9yLWZ1bGxzY3JlZW4td2luZG93cy1vbmx5QGdpdGh1Yi5mcmVkZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "netspeed@alynx.one", "name": "Net Speed", "pname": "net-speed", "description": "Show current net speed on panel.", "link": "https://extensions.gnome.org/extension/4478/net-speed/", "shell_version_map": {"40": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "086nrp8zhlabhpaj013pyw6bhhcgqysyfa0j2cm9lgnjwv112lxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1uZXQtc3BlZWQvIiwKICAidXVpZCI6ICJuZXRzcGVlZEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nCHANGES\n\n - Quarter tiling, for more information see https://github.com/jmmaranan/forge/issues/166. Can be toggled.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "1dblgs42gxxphzy6vffx501np3g6nkclds54wdzs675i82vj4m2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "40": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "41": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "42": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "43": {"version": "61", "sha256": "13ivig36s8chn9ygpk1q7sxv7qgdnlpraq5j7347rlav5qbankra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="}}} +, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nCHANGES\n\n - Quarter tiling, for more information see https://github.com/jmmaranan/forge/issues/166. Can be toggled.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "1dblgs42gxxphzy6vffx501np3g6nkclds54wdzs675i82vj4m2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ptbWFyYW5hbi9mb3JnZSIsCiAgInV1aWQiOiAiZm9yZ2VAam1tYXJhbmFuLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "40": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "41": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "42": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "43": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}}} , {"uuid": "autonightlight@zefty.github.io", "name": "Auto Night Light", "pname": "auto-night-light", "description": "Automatically adjust night light", "link": "https://extensions.gnome.org/extension/4482/auto-night-light/", "shell_version_map": {"38": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "favourites-in-appgrid@harshadgavali.gitlab.org", "name": "Favourites in AppGrid", "pname": "favourites-in-appgrid", "description": "Keep favourite applications in AppGrid", "link": "https://extensions.gnome.org/extension/4485/favourites-in-appgrid/", "shell_version_map": {"40": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1zx3ivzid3cjr5h6070kyb9n2cjsxjg08s7h5ds18by1bahzffkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvaGFyc2hhZGdhdmFsaS9mYXZvdXJpdGVzLWluLWFwcGdyaWQvIiwKICAidXVpZCI6ICJmYXZvdXJpdGVzLWluLWFwcGdyaWRAaGFyc2hhZGdhdmFsaS5naXRsYWIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "dark-variant@hardpixel.eu", "name": "Dark Variant", "pname": "dark-variant", "description": "Enable dark window decorations on applications. This extension is not compatible with applications that use Client Side Decorations (CSD).\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xorg-x11-utils\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable applications.", "link": "https://extensions.gnome.org/extension/4488/dark-variant/", "shell_version_map": {"40": {"version": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1j5pbkxqiqi6nnm1q0ygq9cw9qbrrpsykbrd9zami230wqz6adhy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFyay12YXJpYW50IiwKICAidXVpZCI6ICJkYXJrLXZhcmlhbnRAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "1cvfifkp1z8qazc39aq6b2yc3xwsfnpdwr66mjvgrj6j06ldbraf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogOAp9"}}} @@ -631,7 +631,7 @@ , {"uuid": "gnome-extension-pass-search-provider.lavrov.github.com", "name": "Pass Search Provider", "pname": "pass-search-provider", "description": "Shows matching pass entries in gnome search", "link": "https://extensions.gnome.org/extension/4645/pass-search-provider/", "shell_version_map": {"40": {"version": "6", "sha256": "06msk4zds1q6jjdw6g7akbsiyfz0avwvydpykcylhhc9ribzsncn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG1hdGNoaW5nIHBhc3MgZW50cmllcyBpbiBnbm9tZSBzZWFyY2giLAogICJuYW1lIjogIlBhc3MgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdnJvdi9nbm9tZS1leHRlbnNpb24tcGFzcy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1wYXNzLXNlYXJjaC1wcm92aWRlci5sYXZyb3YuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "027jz7h07340ayqvzji8l33x2y7jxrzf64wr4gvh16dbgw1229fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0Rlc2t0b3AtQ3ViZSIsCiAgInV1aWQiOiAiZGVza3RvcC1jdWJlQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": {"40": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "13hjbixsr10dfc1yjj6xh1gc3rhs4rx0wppxwp7rfv0x1f0d3813", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWt1Ym93c2tpL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1yZWxvYWRlZCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZEBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "gnome-extension-brightness@bruno.englert.gitlab.com", "name": "Adjust Display Brightness", "pname": "adjust-display-brightness", "description": "Simple GNOME extension to control displays' brightness via DDC. It requires ddcutil to be installed, I2C permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4652/adjust-display-brightness/", "shell_version_map": {"40": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "17q2644zi9idq0i3msiwnz5nfhd1hffd2fn3yrvj6m2rnar9x59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"uuid": "gnome-extension-brightness@bruno.englert.gitlab.com", "name": "Adjust Display Brightness", "pname": "adjust-display-brightness", "description": "Simple GNOME extension to control displays' brightness via DDC. It requires ddcutil to be installed, I2C permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4652/adjust-display-brightness/", "shell_version_map": {"40": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {"40": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "1x84k8714y0bqvy4qcyhrw3vbhw0kaf95sns62j6h9a0xb0ldw78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvZGF0ZS1tZW51LWZvcm1hdHRlciIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "surf@diegonz.github.io", "name": "Surf", "pname": "surf", "description": "Visit URL or perform a web search with the terms provided directly from GNOME Shell", "link": "https://extensions.gnome.org/extension/4661/surf/", "shell_version_map": {"38": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "04rs32jzy89vr2fyw44vmjx47l2kkdhqklqms9fqckf8ii3l4h56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc2l0IFVSTCBvciBwZXJmb3JtIGEgd2ViIHNlYXJjaCB3aXRoIHRoZSB0ZXJtcyBwcm92aWRlZCBkaXJlY3RseSBmcm9tIEdOT01FIFNoZWxsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN1cmYiLAogICJuYW1lIjogIlN1cmYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VyZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ29uei9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3VyZiIsCiAgInV1aWQiOiAic3VyZkBkaWVnb256LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "CustomizeClockOnLockScreen@pratap.fastmail.fm", "name": "Customize Clock on Lock Screen", "pname": "customize-clock-on-lock-screen", "description": "Customize Clock on Lock Screen.", "link": "https://extensions.gnome.org/extension/4663/customize-clock-on-lock-screen/", "shell_version_map": {"41": {"version": "5", "sha256": "1nnkyvppbga65dpmszv066hps12p0b5rcaimhn489x2bzhyiycn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1nnkyvppbga65dpmszv066hps12p0b5rcaimhn489x2bzhyiycn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbi4iLAogICJuYW1lIjogIkN1c3RvbWl6ZSBDbG9jayBvbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2N1c3RvbWl6ZS1jbG9jay1vbi1sb2NrLXNjcmVlbiIsCiAgInV1aWQiOiAiQ3VzdG9taXplQ2xvY2tPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -640,7 +640,7 @@ , {"uuid": "cloudflare-warp-gnome@harshan01", "name": "Cloudflare 1.1.1.1 WARP Switcher", "pname": "cloudflare-1111-warp-switcher", "description": "Unofficial Cloudflare 1.1.1.1 WARP Switcher extension for GNOME shell", "link": "https://extensions.gnome.org/extension/4670/cloudflare-1111-warp-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "alt-tab-move-mouse@buzztaiki.github.com", "name": "Alt-Tab Move Mouse", "pname": "alt-tab-move-mouse", "description": "Move mouse pointer onto active window after Alt-Tab. This extension is workaround of some sloppy focus problems", "link": "https://extensions.gnome.org/extension/4673/alt-tab-move-mouse/", "shell_version_map": {"40": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "Server@sven.kramer", "name": "Server", "pname": "server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed. This extension is only tested with Gnome 40+. Didnt test it yet with older versions.", "link": "https://extensions.gnome.org/extension/4676/server/", "shell_version_map": {"38": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "40": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {"40": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server urls, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "9", "sha256": "19afjjkkga6ky7ixc03ga7fyg49jkqld01v05pq5jrbf1bhzgvcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0My4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} @@ -651,7 +651,7 @@ , {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME Shell 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview and will hide when you leave the dash. Native GNOME Shell click behavior is modified: intelligent minimize if one window is open, cycle if several windows are open. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "41": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "42": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "43": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close open windows gracefully and save them as a session. And you can restore them when necessary manually or automatically at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows gracefully\n- Close apps with multiple windows gracefully via `ydotool` so you don't lose sessions of this app. Please see https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to make `Close by rules` work\n- Save open windows\n- Restore session(s)\n- Restore a session at startup. Please note that this feature is disabled by default. See https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to enable and use it\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via `Alt+F2 then type r` or `killall -3 gnome-shell`.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "41": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "42": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "A Gnome shell extension to close open windows gracefully and save them as a session. The previous session can be restored at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Restore the previous session at startup. disabled by default.\n- Save running apps and windows automatically when necessary, this will be used to restore the previous session at startup.\n- Close running apps and windows automatically before Log Out, Restart, Power Off. disabled by default.\n- Close running windows gracefully\n- Close apps with multiple windows gracefully via ydotool so you don't lose sessions of this app (See also: How to make Close by rules work)\n- Save running apps and windows manually\n- Restore a selected session at startup (See also: #9). disabled by default.\n- Restore a saved session manually\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via Alt+F2 -&amp;gt; r or killall -3 gnome-shell.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\n- Search saved session by the session name fuzzily\n\nFor more information, please visit https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager/blob/feature-close-save-session-while-logout/README.md", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "34", "sha256": "1mz3gzwfgrinyrwqjwghrxfmzh6c3yz1wk0mjidkyqjayrq20n32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBUaGUgcHJldmlvdXMgc2Vzc2lvbiBjYW4gYmUgcmVzdG9yZWQgYXQgc3RhcnR1cC4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIFJlc3RvcmUgdGhlIHByZXZpb3VzIHNlc3Npb24gYXQgc3RhcnR1cC4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSB3aGVuIG5lY2Vzc2FyeSwgdGhpcyB3aWxsIGJlIHVzZWQgdG8gcmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLlxuLSBDbG9zZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSBiZWZvcmUgTG9nIE91dCwgUmVzdGFydCwgUG93ZXIgT2ZmLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBDbG9zZSBydW5uaW5nIHdpbmRvd3MgZ3JhY2VmdWxseVxuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyBncmFjZWZ1bGx5IHZpYSB5ZG90b29sIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwIChTZWUgYWxzbzogSG93IHRvIG1ha2UgQ2xvc2UgYnkgcnVsZXMgd29yaylcbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgbWFudWFsbHlcbi0gUmVzdG9yZSBhIHNlbGVjdGVkIHNlc3Npb24gYXQgc3RhcnR1cCAoU2VlIGFsc286ICM5KS4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gUmVzdG9yZSBhIHNhdmVkIHNlc3Npb24gbWFudWFsbHlcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCBBbHdheXMgb24gVmlzaWJsZSBXb3Jrc3BhY2UgYW5kIG1heGltaXphdGlvblxuLSBSZXN0b3JlIHdpbmRvdyB3b3Jrc3BhY2UsIHNpemUgYW5kIHBvc2l0aW9uXG4tIFJlc3RvcmUgMiBjb2x1bW4gd2luZG93IHRpbGluZ1xuLSBTdGFzaCBhbGwgc3VwcG9ydGVkIHdpbmRvdyBzdGF0ZXMgc28gdGhhdCB0aG9zZSBzdGF0ZXMgd2lsbCBiZSByZXN0b3JlZCBhZnRlciBnbm9tZSBzaGVsbCByZXN0YXJ0cyB2aWEgQWx0K0YyIC0mYW1wO2FtcDtndDsgciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}, "41": {"version": "34", "sha256": "1mz3gzwfgrinyrwqjwghrxfmzh6c3yz1wk0mjidkyqjayrq20n32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBUaGUgcHJldmlvdXMgc2Vzc2lvbiBjYW4gYmUgcmVzdG9yZWQgYXQgc3RhcnR1cC4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIFJlc3RvcmUgdGhlIHByZXZpb3VzIHNlc3Npb24gYXQgc3RhcnR1cC4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSB3aGVuIG5lY2Vzc2FyeSwgdGhpcyB3aWxsIGJlIHVzZWQgdG8gcmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLlxuLSBDbG9zZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSBiZWZvcmUgTG9nIE91dCwgUmVzdGFydCwgUG93ZXIgT2ZmLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBDbG9zZSBydW5uaW5nIHdpbmRvd3MgZ3JhY2VmdWxseVxuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyBncmFjZWZ1bGx5IHZpYSB5ZG90b29sIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwIChTZWUgYWxzbzogSG93IHRvIG1ha2UgQ2xvc2UgYnkgcnVsZXMgd29yaylcbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgbWFudWFsbHlcbi0gUmVzdG9yZSBhIHNlbGVjdGVkIHNlc3Npb24gYXQgc3RhcnR1cCAoU2VlIGFsc286ICM5KS4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gUmVzdG9yZSBhIHNhdmVkIHNlc3Npb24gbWFudWFsbHlcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCBBbHdheXMgb24gVmlzaWJsZSBXb3Jrc3BhY2UgYW5kIG1heGltaXphdGlvblxuLSBSZXN0b3JlIHdpbmRvdyB3b3Jrc3BhY2UsIHNpemUgYW5kIHBvc2l0aW9uXG4tIFJlc3RvcmUgMiBjb2x1bW4gd2luZG93IHRpbGluZ1xuLSBTdGFzaCBhbGwgc3VwcG9ydGVkIHdpbmRvdyBzdGF0ZXMgc28gdGhhdCB0aG9zZSBzdGF0ZXMgd2lsbCBiZSByZXN0b3JlZCBhZnRlciBnbm9tZSBzaGVsbCByZXN0YXJ0cyB2aWEgQWx0K0YyIC0mYW1wO2FtcDtndDsgciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}, "42": {"version": "34", "sha256": "1mz3gzwfgrinyrwqjwghrxfmzh6c3yz1wk0mjidkyqjayrq20n32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBUaGUgcHJldmlvdXMgc2Vzc2lvbiBjYW4gYmUgcmVzdG9yZWQgYXQgc3RhcnR1cC4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIFJlc3RvcmUgdGhlIHByZXZpb3VzIHNlc3Npb24gYXQgc3RhcnR1cC4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSB3aGVuIG5lY2Vzc2FyeSwgdGhpcyB3aWxsIGJlIHVzZWQgdG8gcmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLlxuLSBDbG9zZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSBiZWZvcmUgTG9nIE91dCwgUmVzdGFydCwgUG93ZXIgT2ZmLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBDbG9zZSBydW5uaW5nIHdpbmRvd3MgZ3JhY2VmdWxseVxuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyBncmFjZWZ1bGx5IHZpYSB5ZG90b29sIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwIChTZWUgYWxzbzogSG93IHRvIG1ha2UgQ2xvc2UgYnkgcnVsZXMgd29yaylcbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgbWFudWFsbHlcbi0gUmVzdG9yZSBhIHNlbGVjdGVkIHNlc3Npb24gYXQgc3RhcnR1cCAoU2VlIGFsc286ICM5KS4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gUmVzdG9yZSBhIHNhdmVkIHNlc3Npb24gbWFudWFsbHlcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCBBbHdheXMgb24gVmlzaWJsZSBXb3Jrc3BhY2UgYW5kIG1heGltaXphdGlvblxuLSBSZXN0b3JlIHdpbmRvdyB3b3Jrc3BhY2UsIHNpemUgYW5kIHBvc2l0aW9uXG4tIFJlc3RvcmUgMiBjb2x1bW4gd2luZG93IHRpbGluZ1xuLSBTdGFzaCBhbGwgc3VwcG9ydGVkIHdpbmRvdyBzdGF0ZXMgc28gdGhhdCB0aG9zZSBzdGF0ZXMgd2lsbCBiZSByZXN0b3JlZCBhZnRlciBnbm9tZSBzaGVsbCByZXN0YXJ0cyB2aWEgQWx0K0YyIC0mYW1wO2FtcDtndDsgciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}, "43": {"version": "34", "sha256": "1mz3gzwfgrinyrwqjwghrxfmzh6c3yz1wk0mjidkyqjayrq20n32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBUaGUgcHJldmlvdXMgc2Vzc2lvbiBjYW4gYmUgcmVzdG9yZWQgYXQgc3RhcnR1cC4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIFJlc3RvcmUgdGhlIHByZXZpb3VzIHNlc3Npb24gYXQgc3RhcnR1cC4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSB3aGVuIG5lY2Vzc2FyeSwgdGhpcyB3aWxsIGJlIHVzZWQgdG8gcmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLlxuLSBDbG9zZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgYXV0b21hdGljYWxseSBiZWZvcmUgTG9nIE91dCwgUmVzdGFydCwgUG93ZXIgT2ZmLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBDbG9zZSBydW5uaW5nIHdpbmRvd3MgZ3JhY2VmdWxseVxuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyBncmFjZWZ1bGx5IHZpYSB5ZG90b29sIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwIChTZWUgYWxzbzogSG93IHRvIG1ha2UgQ2xvc2UgYnkgcnVsZXMgd29yaylcbi0gU2F2ZSBydW5uaW5nIGFwcHMgYW5kIHdpbmRvd3MgbWFudWFsbHlcbi0gUmVzdG9yZSBhIHNlbGVjdGVkIHNlc3Npb24gYXQgc3RhcnR1cCAoU2VlIGFsc286ICM5KS4gZGlzYWJsZWQgYnkgZGVmYXVsdC5cbi0gUmVzdG9yZSBhIHNhdmVkIHNlc3Npb24gbWFudWFsbHlcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCBBbHdheXMgb24gVmlzaWJsZSBXb3Jrc3BhY2UgYW5kIG1heGltaXphdGlvblxuLSBSZXN0b3JlIHdpbmRvdyB3b3Jrc3BhY2UsIHNpemUgYW5kIHBvc2l0aW9uXG4tIFJlc3RvcmUgMiBjb2x1bW4gd2luZG93IHRpbGluZ1xuLSBTdGFzaCBhbGwgc3VwcG9ydGVkIHdpbmRvdyBzdGF0ZXMgc28gdGhhdCB0aG9zZSBzdGF0ZXMgd2lsbCBiZSByZXN0b3JlZCBhZnRlciBnbm9tZSBzaGVsbCByZXN0YXJ0cyB2aWEgQWx0K0YyIC0mYW1wO2FtcDtndDsgciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNAp9"}}} , {"uuid": "prevent-double-empty-window@silliewous.nl", "name": "Prevent double empty window", "pname": "prevent-double-empty-window", "description": "Set MIN_NUMBER_WORKSPACES to 1 so there is only one empty workspace when there are no windows open.\n\nhttps://gitlab.com/g3786/prevent-double-empty-window", "link": "https://extensions.gnome.org/extension/4711/prevent-double-empty-window/", "shell_version_map": {"40": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "048h90h8ckm0zzwjr4h5kv96gak1mzcpygv826l1pmll890ac3n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Simple GNOME extension to control displays' brightness and audio volume via DDC. It requires ddcutil to be installed, i2c permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1mkks185kv7ks3gjznffawjllw7lr2z4003hbarlb2k90qs8nif4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -681,7 +681,7 @@ , {"uuid": "compare@eexpss.gmail.com", "name": "Compare or Open", "pname": "compare-filedir-from-clip", "description": "Copy/Select two Dirs/Files from anywhere such as `nautilus` or `gnome-terminal`, and then compare them (use `meld`) or open with Ctrl-O or open with context-menu.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {"40": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "freq-boost-switch@metal03326", "name": "Frequency Boost Switch", "pname": "frequency-boost-switch", "description": "Add a toggle to enable/disable CPU frequency boost in Gnome Power Profiles menu.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "9", "sha256": "0fj1bc209l2zz8cwllxm5nadd0hmvikf9d1ydfwc25l201czl68m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Binds Pop-Launcher on Super-Key (Fork of Pop-Cosmic Extension)\n\nSince Pop!_OS moves to its own desktop enviroment (COSMIC DE) and I left linux behind me this extension will not get continued.\n\n! Requirements ! : Pop-Launcher and Pop-Shell have to be installed on used OS", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "19", "sha256": "1sas1z00r0ygbx8jhhj7wlixzjf8qwnfifdmiwcljwrdxvm8a2kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "20", "sha256": "0bi4mm9i8bhgdfiqklzyhifkbm8cwh4zr4xpza60fmjm8il41w7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": {"40": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": {"40": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {"38": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -710,7 +710,7 @@ , {"uuid": "Hitokoto@teaper.dev", "name": "Hitokoto", "pname": "hitokoto", "description": "一言短句", "link": "https://extensions.gnome.org/extension/4887/hitokoto/", "shell_version_map": {"41": {"version": "1", "sha256": "1dmsrgxnajwifc5wlrqhcddyf10a5m94wycnx5411j538607v83k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1NGUwMFx1OGEwMFx1NzdlZFx1NTNlNSIsCiAgIm5hbWUiOiAiSGl0b2tvdG8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZWFwZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpdG9rb3RvIiwKICAidXVpZCI6ICJIaXRva290b0B0ZWFwZXIuZGV2IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "snap-manager-lite@fthx", "name": "Snap Manager Lite", "pname": "snap-manager-lite", "description": "Popup menu in the top bar to easily manage usual snap tasks (list, changes, refresh, remove, install...).\n\nNo update notification at session start-up: use Snap Manager extension for that.\n\nAll the results of actions are displayed in GNOME Terminal, so you can exactly know what you are doing and what is processing. Very light extension, no background process, no periodic background task.\n\nYou can disable snaps auto updates for a some time (up to +oo) and consequently manually manage them.\n\nThis is not an official Ubuntu/Canonical extension.", "link": "https://extensions.gnome.org/extension/4889/snap-manager-lite/", "shell_version_map": {"38": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ddccfkrm2iwblfaq240m25clqjcwa3drlp60n268pybg8d1ril7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "4", "sha256": "0qjb4fwdnq0rs2i7j1g694mjib272s69nccarjkwiy5wwyqxafxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0qjb4fwdnq0rs2i7j1g694mjib272s69nccarjkwiy5wwyqxafxf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG5ObyB1cGRhdGUgbm90aWZpY2F0aW9uIGF0IHNlc3Npb24gc3RhcnQtdXA6IHVzZSBTbmFwIE1hbmFnZXIgZXh0ZW5zaW9uIGZvciB0aGF0LlxuXG5BbGwgdGhlIHJlc3VsdHMgb2YgYWN0aW9ucyBhcmUgZGlzcGxheWVkIGluIEdOT01FIFRlcm1pbmFsLCBzbyB5b3UgY2FuIGV4YWN0bHkga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcgYW5kIHdoYXQgaXMgcHJvY2Vzc2luZy4gVmVyeSBsaWdodCBleHRlbnNpb24sIG5vIGJhY2tncm91bmQgcHJvY2Vzcywgbm8gcGVyaW9kaWMgYmFja2dyb3VuZCB0YXNrLlxuXG5Zb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIHNvbWUgdGltZSAodXAgdG8gK29vKSBhbmQgY29uc2VxdWVudGx5IG1hbnVhbGx5IG1hbmFnZSB0aGVtLlxuXG5UaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3NuYXAtbWFuYWdlci1saXRlIiwKICAidXVpZCI6ICJzbmFwLW1hbmFnZXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "move-panel@lzbz.gitlab.com", "name": "Move Panel", "pname": "move-panel", "description": "Moves panel to secondary monitor on startup, without changing the primary display. Only works on Wayland.", "link": "https://extensions.gnome.org/extension/4890/move-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1risn5j48kgzdhlyrll5s4qwdznhzqshflz18zgfhx336yngp34f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "usable-overview@mechtifs", "name": "Usable Overview", "pname": "usable-overview", "description": "Right click at top left corner to bring up apps menu.", "link": "https://extensions.gnome.org/extension/4895/usable-overview/", "shell_version_map": {"40": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "03rfnfa4d4qcgcishfh61f12sn5j4smdsnnfbjc5sbcgrqsshiwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "usable-overview@mechtifs", "name": "Usable Overview", "pname": "usable-overview", "description": "Right click at top left corner to bring up apps menu.", "link": "https://extensions.gnome.org/extension/4895/usable-overview/", "shell_version_map": {"40": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "overview-clicking@mechtifs", "name": "Overview Clicking", "pname": "overview-clicking", "description": "Close the overview or show up application grid by left/right clicking empty space. Forked from click-to-close-overview@l3nn4rt.github.io.", "link": "https://extensions.gnome.org/extension/4898/overview-clicking/", "shell_version_map": {"40": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "speed@eexpss.gmail.com", "name": "Screen Net Speed", "pname": "screen-net-speed", "description": "* Animation net speed show on the screen. You can click it to have fun and pass the time. Can be turned on / off at any time.\nScroll Mouse on panel icon, can change the shape.", "link": "https://extensions.gnome.org/extension/4901/screen-net-speed/", "shell_version_map": {"40": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "addshutbutton@jerom@olika.ovh", "name": "Add Shutdown Button", "pname": "add-shutdown-button", "description": "Add a button power off", "link": "https://extensions.gnome.org/extension/4905/add-shutdown-button/", "shell_version_map": {"40": {"version": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -720,16 +720,16 @@ , {"uuid": "weather@eexpss.gmail.com", "name": "Weather", "pname": "weather", "description": "Animation Weather. \nMouse 1: show weather\nMouse 2: refresh weather\nMouse 3: dismiss\nScrollUp: increase day\nScrollDown: decrease day\nAdded i18n date, weather, temperature", "link": "https://extensions.gnome.org/extension/4919/weather/", "shell_version_map": {"40": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "13", "sha256": "05mijfwd5pxsf45bk1ld3g18dvdni41gz0yvq1bm944igp3wnqki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyIiwKICAibmFtZSI6ICJXZWF0aGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtd2VhdGhlciIsCiAgInV1aWQiOiAid2VhdGhlckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "whiteborder@aaronbpaden.gmail.com", "name": "White Border Overlay", "pname": "white-border-overlay", "description": "Draw a white border around the desktop to enable (hopefully) universal application support for the Sinden Lightgun.", "link": "https://extensions.gnome.org/extension/4922/white-border-overlay/", "shell_version_map": {"38": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "git@eexpss.gmail.com", "name": "Git Monitor", "pname": "git", "description": "## monitor git directory for changes.\n> Working with a lot of git directories, I always forgot commit.\n### Panel Icon\n- Mouse 2, force refresh (re-read config file, check git dirs, refresh menu).\n- Mouse 3, open configfile. config file is `~/.config/git-monitor.json`.\n### Menu Item\n- Directory: Mouse 1 opened in the Files(Nautilus), Mouse 3 open in the gnome-terminal.\n- Files: Mouse 1, opened with `git difftool`, eg `meld`. Mouse 3, open file.", "link": "https://extensions.gnome.org/extension/4925/git/", "shell_version_map": {"40": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Display in your panel the (song)title, album and/or artist name available from an mpris compatible player, such as Spotify, Vlc, Rhythmbox, Firefox, Chromium and many more. Lots of features and very customizable!\n\nLast update: Version 12 (Jan 26 2023)\n- Fixes issues with the panel position being \"stolen\" by other extensions\n- Adds filters to allow/disallow specified mpris sources\n- Adds tooltips(hints) for various options\n\nAny feedback is gladly welcomed!", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Display in your panel the (song)title, album and/or artist name available from an mpris compatible media player, such as Spotify, Vlc, Rhythmbox, Firefox, Chromium and many more. Lots of features and very customizable!\n\nLast update: Version 12 (Jan 26 2023)\n- Fixes issues with the panel position being \"stolen\" by other extensions\n- Adds filters to allow/disallow specified mpris sources\n- Adds tooltips(hints) for various options\n\nAny feedback is gladly welcomed!", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "captivate@rensoliemans.nl", "name": "Captivate", "pname": "captivate", "description": "Activate your CapsLock button.\nUsing gnome-tweaks, remap your CapsLock to a Menu key, and then this extension works perfectly. Alternatively, choose a different key in the extension settings.\n\nDon't forget to log out and in again if you're updating the extension manually.", "link": "https://extensions.gnome.org/extension/4932/captivate/", "shell_version_map": {"40": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "goto-previous-workspaces@zubarev.net", "name": "Switch workspaces to previous", "pname": "switch-workspaces-to-previous", "description": "move to previous workspace", "link": "https://extensions.gnome.org/extension/4935/switch-workspaces-to-previous/", "shell_version_map": {"38": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "draw-on-your-screen2@zhrexl.github.com", "name": "Draw On Your Screen 2", "pname": "draw-on-you-screen-2", "description": "This is a fork from Abakk Draw On Your Screen. Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot", "link": "https://extensions.gnome.org/extension/4937/draw-on-you-screen-2/", "shell_version_map": {"40": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "aztaskbar@aztaskbar.gitlab.com", "name": "App Icons Taskbar", "pname": "app-icons-taskbar", "description": "A simple app icon taskbar. Show running apps and favorites on the main panel.", "link": "https://extensions.gnome.org/extension/4944/app-icons-taskbar/", "shell_version_map": {"41": {"version": "7", "sha256": "1slix3771pmzdbhwsacssvbplfgsg7sq1in4xrja3wfz5ffikdb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "14", "sha256": "162sphzjjsdspx77140y6xpdvnmgv54ml3ahq5lnk5hjyzsqkapm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "162sphzjjsdspx77140y6xpdvnmgv54ml3ahq5lnk5hjyzsqkapm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGFwcCBpY29uIHRhc2tiYXIuIFNob3cgcnVubmluZyBhcHBzIGFuZCBmYXZvcml0ZXMgb24gdGhlIG1haW4gcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXp0YXNrYmFyIiwKICAibmFtZSI6ICJBcHAgSWNvbnMgVGFza2JhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5henRhc2tiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0FuZHJld1phZWNoL2F6dGFza2JhciIsCiAgInV1aWQiOiAiYXp0YXNrYmFyQGF6dGFza2Jhci5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "netSpeedMonitor@nidyran.github.io", "name": "net speed monitor", "pname": "net-speed-monitor", "description": "This extension helps tracking and monitoring network speed. \nThere are five modes: \n1 - download speed only. \n2 - upload speed only. \n3 - download speed and upload speed together. \n4 - download speed and upload speed summed. \n5 - total data usage \nTo switch between modes, use left mouse click. \nTo switch between available sources, use right mouse click. \nTo change refresh time 200 - 1000 use middle mouse click. \nThe first source with usage higher than zero will be picked by default. \nThe extension will pick the first source by default, and if no traffic is established it will switch to the next one and so on\nThe source code is available in the link below, update requests are welcome.", "link": "https://extensions.gnome.org/extension/4947/net-speed-monitor/", "shell_version_map": {"38": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1zvp8zx82kqbf9ck55csgcysld3z1gr3cigkl5y73s5rvqj3ks5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHRyYWNraW5nIGFuZCBtb25pdG9yaW5nIG5ldHdvcmsgc3BlZWQuIFxuVGhlcmUgYXJlIGZpdmUgbW9kZXM6IFxuMSAtIGRvd25sb2FkIHNwZWVkIG9ubHkuIFxuMiAtIHVwbG9hZCBzcGVlZCBvbmx5LiBcbjMgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHRvZ2V0aGVyLiBcbjQgLSBkb3dubG9hZCBzcGVlZCBhbmQgdXBsb2FkIHNwZWVkIHN1bW1lZC4gXG41IC0gdG90YWwgZGF0YSB1c2FnZSBcblRvIHN3aXRjaCBiZXR3ZWVuIG1vZGVzLCB1c2UgbGVmdCBtb3VzZSBjbGljay4gXG5UbyBzd2l0Y2ggYmV0d2VlbiBhdmFpbGFibGUgc291cmNlcywgdXNlIHJpZ2h0IG1vdXNlIGNsaWNrLiBcblRvIGNoYW5nZSByZWZyZXNoIHRpbWUgMjAwIC0gMTAwMCB1c2UgbWlkZGxlIG1vdXNlIGNsaWNrLiBcblRoZSBmaXJzdCBzb3VyY2Ugd2l0aCB1c2FnZSBoaWdoZXIgdGhhbiB6ZXJvIHdpbGwgYmUgcGlja2VkIGJ5IGRlZmF1bHQuIFxuVGhlIGV4dGVuc2lvbiB3aWxsIHBpY2sgdGhlIGZpcnN0IHNvdXJjZSBieSBkZWZhdWx0LCBhbmQgaWYgbm8gdHJhZmZpYyBpcyBlc3RhYmxpc2hlZCBpdCB3aWxsIHN3aXRjaCB0byB0aGUgbmV4dCBvbmUgYW5kIHNvIG9uXG5UaGUgc291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBsaW5rIGJlbG93LCB1cGRhdGUgcmVxdWVzdHMgYXJlIHdlbGNvbWUuIiwKICAibmFtZSI6ICJuZXQgc3BlZWQgbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmlkeXJhbi9uZXRTcGVlZE1vbml0b3IvIiwKICAidXVpZCI6ICJuZXRTcGVlZE1vbml0b3JAbmlkeXJhbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "gradienttopbar@pshow.org", "name": "Gradient Top Bar", "pname": "gradient-top-bar", "description": "Makes GNOME's topbar's background gradient.", "link": "https://extensions.gnome.org/extension/4955/gradient-top-bar/", "shell_version_map": {"38": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0i93xakwcmcxi29bbyw2i41rfby4qlrqcm4vfjpbc2h8q9kpxfh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "gradienttopbar@pshow.org", "name": "Gradient Top Bar", "pname": "gradient-top-bar", "description": "Makes GNOME's topbar's background gradient.", "link": "https://extensions.gnome.org/extension/4955/gradient-top-bar/", "shell_version_map": {"38": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "clipman@popov895.ukr.net", "name": "Clipman", "pname": "clipman", "description": "Simple clipboard manager.", "link": "https://extensions.gnome.org/extension/4958/clipman/", "shell_version_map": {"40": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1z0nrwmsf4amp1jhgfwqbvsajjanwvnh0b9hn8giidqaz17fxdk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb3Bvdjg5NS9DbGlwbWFuIiwKICAidXVpZCI6ICJjbGlwbWFuQHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "24", "sha256": "01x362z05bk3335a3cavwxmd2bnq97d018bjfd2vabbkc1ry1p15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"}, "43": {"version": "24", "sha256": "01x362z05bk3335a3cavwxmd2bnq97d018bjfd2vabbkc1ry1p15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L0NsaXBtYW4iLAogICJ1dWlkIjogImNsaXBtYW5AcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"uuid": "note@eexpss.gmail.com", "name": "note", "pname": "note", "description": "Add selected text to Note.\n- Notes automatic recognition and sort as 'Directory' 'Command' 'Clipboard'.\n- 'Directory': Mouse 1/2/3 act as 'Open in Files/Open in termianl/Paste dir'. It can be used as a temporary bookmark. And any click will change the working diretory in real time.\n- 'Command': Mouse 1/3 as 'Excute command in Terminal/Paste cmd'.\n- 'Clipboard': Mouse act as 'Paste to Clipboard(PRIMARY)'.\n- Terminal support kgx(new gnome-console) and gnome-terminal.", "link": "https://extensions.gnome.org/extension/4962/note/", "shell_version_map": {"42": {"version": "7", "sha256": "1niwlhls41l92g0bcllp4y4bdhn7k310514xkd36rn61pqz9b7q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzZWxlY3RlZCB0ZXh0IHRvIE5vdGUuXG4tIE5vdGVzIGF1dG9tYXRpYyByZWNvZ25pdGlvbiBhbmQgc29ydCBhcyAnRGlyZWN0b3J5JyAnQ29tbWFuZCcgJ0NsaXBib2FyZCcuXG4tICdEaXJlY3RvcnknOiBNb3VzZSAxLzIvMyBhY3QgYXMgJ09wZW4gaW4gRmlsZXMvT3BlbiBpbiB0ZXJtaWFubC9QYXN0ZSBkaXInLiBJdCBjYW4gYmUgdXNlZCBhcyBhIHRlbXBvcmFyeSBib29rbWFyay4gQW5kIGFueSBjbGljayB3aWxsIGNoYW5nZSB0aGUgd29ya2luZyBkaXJldG9yeSBpbiByZWFsIHRpbWUuXG4tICdDb21tYW5kJzogTW91c2UgMS8zIGFzICdFeGN1dGUgY29tbWFuZCBpbiBUZXJtaW5hbC9QYXN0ZSBjbWQnLlxuLSAnQ2xpcGJvYXJkJzogTW91c2UgYWN0IGFzICdQYXN0ZSB0byBDbGlwYm9hcmQoUFJJTUFSWSknLlxuLSBUZXJtaW5hbCBzdXBwb3J0IGtneChuZXcgZ25vbWUtY29uc29sZSkgYW5kIGdub21lLXRlcm1pbmFsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGUiLAogICJuYW1lIjogIm5vdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1ub3RlIiwKICAidXVpZCI6ICJub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "ddnet-friends-panel@hus3h", "name": "DDNet Friends Panel", "pname": "ddnet-friends-panel", "description": "Automatically check for online DDNet friends and join them from your top bar.\n\nThis extension will check for online DDNet friends every 1 minute and show their count in your top bar. You can click the indicator to expand the panel and see more details like what map each friend is playing, you can click on a friend list item to launch the game and connect to the server they are in.", "link": "https://extensions.gnome.org/extension/4965/ddnet-friends-panel/", "shell_version_map": {"40": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "14qly508cm9h7v4ws0gd1bvfhcnlbvlxm0rr21pydz9g9pf9bg7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi4iLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9odXMzaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGRuZXQtZnJpZW5kcy1wYW5lbCIsCiAgInV1aWQiOiAiZGRuZXQtZnJpZW5kcy1wYW5lbEBodXMzaCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "ddnet-friends-panel@hus3h", "name": "DDNet Friends Panel", "pname": "ddnet-friends-panel", "description": "Automatically check for online DDNet friends and join them from your top bar.\n\nThis extension will check for online DDNet friends every 1 minute and show their count in your top bar. You can click the indicator to expand the panel and see more details like what map each friend is playing, you can click on a friend list item to launch the game and connect to the server they are in.\n\nMore details: https://github.com/hus3h/gnome-shell-extension-ddnet-friends-panel", "link": "https://extensions.gnome.org/extension/4965/ddnet-friends-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "theme-switcher@fthx", "name": "Light/Dark Theme Switcher", "pname": "lightdark-theme-switcher", "description": "Button in panel: switch between global dark and light themes. For GNOME Shell 42+.", "link": "https://extensions.gnome.org/extension/4968/lightdark-theme-switcher/", "shell_version_map": {"42": {"version": "6", "sha256": "0m66lvx8pygy9kk8pkzy21pa3ac8ka0ghk5bqy68f3nsmfp9q4qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInRoZW1lLXN3aXRjaGVyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "0m66lvx8pygy9kk8pkzy21pa3ac8ka0ghk5bqy68f3nsmfp9q4qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInRoZW1lLXN3aXRjaGVyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "window-calls-extended@hseliger.eu", "name": "Window Calls Extended", "pname": "window-calls-extended", "description": "Add new dbus call for windows to get windows list and some of theirs properties, plus details on window under focus.", "link": "https://extensions.gnome.org/extension/4974/window-calls-extended/", "shell_version_map": {"41": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0krzyxwzij1j335z7lhk7mmgvgnp2cxrgkp5ln5m4a5k4zyn6hra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oc2VsaWdlci93aW5kb3ctY2FsbHMtZXh0ZW5kZWQiLAogICJ1dWlkIjogIndpbmRvdy1jYWxscy1leHRlbmRlZEBoc2VsaWdlci5ldSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "Sur_Clock@medaip90.com", "name": "Sur Clock", "pname": "sur-clock", "description": "Move the clock to the left or the right of the system indicators like in MacOs.", "link": "https://extensions.gnome.org/extension/4977/sur-clock/", "shell_version_map": {"40": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0kjwzickw4ch7vmkw81d6wiad9hrwiz1i898mb2gmjby6g83d1sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NZWRhaVA5MC9nbm9tZS1zdXItY2xvY2siLAogICJ1dWlkIjogIlN1cl9DbG9ja0BtZWRhaXA5MC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -740,13 +740,13 @@ , {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {"40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "legacyschemeautoswitcher@joshimukul29.gmail.com", "name": "Legacy (GTK3) Theme Scheme Auto Switcher", "pname": "legacy-gtk3-theme-scheme-auto-switcher", "description": "Change the GTK3 theme to light/dark variant based on the system color scheme on Gnome 42", "link": "https://extensions.gnome.org/extension/4998/legacy-gtk3-theme-scheme-auto-switcher/", "shell_version_map": {"42": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflict with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend.\n\nAdds Features:\nDock Alignment\nCustom Border Radius\nCustom Margins", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "43": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflicts with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend. \n\nAdded Features:\nBorder Radius \nBorder Margins\nDock & Icon Alignment\nEtc.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "23", "sha256": "0j1wxm9cd7qb5vgrbpkab6hkyqba4fz9rz4017wydwr1l13gscx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmIEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0j1wxm9cd7qb5vgrbpkab6hkyqba4fz9rz4017wydwr1l13gscx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmIEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0j1wxm9cd7qb5vgrbpkab6hkyqba4fz9rz4017wydwr1l13gscx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmIEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "0j1wxm9cd7qb5vgrbpkab6hkyqba4fz9rz4017wydwr1l13gscx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0cyB3aXRoIENvc21pYyBXb3Jrc3BhY2UuICBJdCBwcmV2ZW50cyBDb3NtaWMgV29ya3NwYWNlcyBmcm9tIGJyZWFraW5nIGFmdGVyIHN1c3BlbmQuIFxuXG5BZGRlZCBGZWF0dXJlczpcbkJvcmRlciBSYWRpdXMgXG5Cb3JkZXIgTWFyZ2luc1xuRG9jayAmIEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need also envycontrol(https://github.com/geminis3/envycontrol) for making this extension working. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {"38": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": {"38": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "overview-dash-hide@rokenz05.github.com", "name": "Overview Dash Hide", "pname": "overview-dash-hide", "description": "Hide dash to dock in activities overview", "link": "https://extensions.gnome.org/extension/5013/overview-dash-hide/", "shell_version_map": {"42": {"version": "1", "sha256": "1i0s0gjyml0q8lz08pwh1nva2yrf5vydpcrz2ncz46qvpjhik7dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgZGFzaCB0byBkb2NrIGluIGFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJuYW1lIjogIk92ZXJ2aWV3IERhc2ggSGlkZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAib3ZlcnZpZXctZGFzaC1oaWRlQHJva2VuejA1LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Set a message on the top bar. Custom command can also be launched on click.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {"40": {"version": "10", "sha256": "08bjap2gp50b4pzs793imcxw41q9jcrzw44bvwzhyrb5s71rfzzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2ltcGxlIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2ltcGxlLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "08bjap2gp50b4pzs793imcxw41q9jcrzw44bvwzhyrb5s71rfzzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2ltcGxlIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2ltcGxlLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "13", "sha256": "16jcix25ydv607c4z9hrl3zhqg01pc6i2ii493xjnlr4mdyld4gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgImdldHRleHQtZG9tYWluIjogInNpbXBsZS1tZXNzYWdlIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "16jcix25ydv607c4z9hrl3zhqg01pc6i2ii493xjnlr4mdyld4gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBhIG1lc3NhZ2Ugb24gdGhlIHRvcCBiYXIuIEN1c3RvbSBjb21tYW5kIGNhbiBhbHNvIGJlIGxhdW5jaGVkIG9uIGNsaWNrLiIsCiAgImdldHRleHQtZG9tYWluIjogInNpbXBsZS1tZXNzYWdlIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZGRlei9nbm9tZS1zaGVsbC1zaW1wbGUtbWVzc2FnZSIsCiAgInV1aWQiOiAic2ltcGxlLW1lc3NhZ2VAZnJlZGRleiIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "activate-window-by-title@lucaswerkmeister.de", "name": "Activate Window By Title", "pname": "activate-window-by-title", "description": "Expose a D-Bus interface to activate a window by its title or WM_CLASS", "link": "https://extensions.gnome.org/extension/5021/activate-window-by-title/", "shell_version_map": {"42": {"version": "3", "sha256": "16fbclbvs9n4910iw7krr4g3nn89nha3nzagjsqc89hg37ngfk4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "16fbclbvs9n4910iw7krr4g3nn89nha3nzagjsqc89hg37ngfk4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "activate-window-by-title@lucaswerkmeister.de", "name": "Activate Window By Title", "pname": "activate-window-by-title", "description": "Expose a D-Bus interface to activate a window by its title or WM_CLASS", "link": "https://extensions.gnome.org/extension/5021/activate-window-by-title/", "shell_version_map": {"42": {"version": "4", "sha256": "0giy8k85qszvw8b26m0b66jjx4vwvwc05y5j6mdjkjlc5cdsmrxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0giy8k85qszvw8b26m0b66jjx4vwvwc05y5j6mdjkjlc5cdsmrxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "nano-system-monitor@eeeeeio", "name": "Nano System Monitor", "pname": "nano-system-monitor", "description": "Show current status on GNOME Shell panel\n\nbar shows CPU|memory|swap usages,then the download|upload speed and CPU temperature and fan speed\n\nDifferent colors represent different percentage states and CPU temperature\n\nplease use monospaced font for best experience", "link": "https://extensions.gnome.org/extension/5037/nano-system-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1kd3c9bml1qh6djjmd4qr393z4zp7il0p3sz9bb7qv2smsg582lf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJOYW5vIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWVlZWVpby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFuby1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAibmFuby1zeXN0ZW0tbW9uaXRvckBlZWVlZWlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "start-overlay-in-application-view@Hex_cz", "name": "Start Overlay in Application View", "pname": "start-overlay-in-application-view", "description": "When activating overview (Super button), the application view is shown instead of the view with the windows.", "link": "https://extensions.gnome.org/extension/5040/start-overlay-in-application-view/", "shell_version_map": {"40": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0zj39jd2l3d2wxx11yvm73rjpljvikr5y9xwxpjf6xmlpxs7hdh9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hleGN6L1N0YXJ0LU92ZXJsYXktaW4tQXBwbGljYXRpb24tVmlldy1mb3ItR25vbWUtNDAtIiwKICAidXVpZCI6ICJzdGFydC1vdmVybGF5LWluLWFwcGxpY2F0aW9uLXZpZXdASGV4X2N6IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "eortologio@danchris.github.io", "name": "Eortologio", "pname": "eortologio-extension", "description": "Simple gnome extension to display the greek namedays", "link": "https://extensions.gnome.org/extension/5046/eortologio-extension/", "shell_version_map": {"41": {"version": "3", "sha256": "0gfg8i0rd83xqf9gqdxx02pl4kj34sn17nkws2d24l1pm55zz7g7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBleHRlbnNpb24gdG8gZGlzcGxheSB0aGUgZ3JlZWsgbmFtZWRheXMiLAogICJuYW1lIjogIkVvcnRvbG9naW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJlb3J0b2xvZ2lvQGRhbmNocmlzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0gfg8i0rd83xqf9gqdxx02pl4kj34sn17nkws2d24l1pm55zz7g7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBleHRlbnNpb24gdG8gZGlzcGxheSB0aGUgZ3JlZWsgbmFtZWRheXMiLAogICJuYW1lIjogIkVvcnRvbG9naW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJlb3J0b2xvZ2lvQGRhbmNocmlzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -783,7 +783,7 @@ , {"uuid": "dollar-to-brl", "name": "Dollar", "pname": "dollar", "description": "Convert Dollar USD to Real BRL using API AWESOMEAPI https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/5159/dollar/", "shell_version_map": {"41": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "upower-battery@codilia.com", "name": "UPower Battery", "pname": "upower-battery", "description": "UPower Battery Indicator.", "link": "https://extensions.gnome.org/extension/5165/upower-battery/", "shell_version_map": {"42": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0wx1hjhn93ppb6dch3cc6zzh7va7jhkggg9xslxa8qyws7mshswp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb2RpbGlhL3Vwb3dlci1iYXR0ZXJ5IiwKICAidXVpZCI6ICJ1cG93ZXItYmF0dGVyeUBjb2RpbGlhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Vertical orientation of workspaces and options to customize Activities overview layout and content for GNOME 40+.\n\nIf you like vertically stacked workpsaces, this extension allows you to customize GNOME Activities to your needs. Layout, visibility and size of the dash and workspace thumbnails, dash orientation, static app grid, static workspace overview modes, static blurred background, workspace titles, window titles always visible, ...", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "1ggfbhfv7c4xnk63kdpjs0qky0bkqcv5w60i2v2ha0j4qcy90i3d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmVydGljYWwtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Vertical orientation of workspaces and options to customize Activities overview layout and content for GNOME 40+.\n\nIf you like vertically stacked workpsaces, this extension allows you to customize GNOME Activities to your needs. Layout, visibility and size of the dash and workspace thumbnails, dash orientation, static app grid, static workspace overview modes, static blurred background, workspace titles, window titles always visible, ...\n\nThe upcoming version (24) that is already available for testing in the GitHub repository offers even more control over Shell UI layout and behavior and works also with horizontally stacked workspaces. It now includes most functionality from the Overview Feature Pack extension, so disable it before activation of the new VW if you use it. I appreciate bug reports and suggestions (on the GitHub).", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {"42": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1d7qqjw7absip9yg248kjw8vj07cxpcvy8pdpvwn6fvinmhp99y4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1pcy1hd2Vzb21lL2dub21lX2V4dGVuc2lvbl9yb2NrZXRiYXIiLAogICJ1dWlkIjogInJvY2tldGJhckBjaGVwa3VuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next codeforces contest. This extension uses the API of codeforces.com to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": {"40": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "toggle-window@togglewindow.com", "name": "Toggle Window", "pname": "toggle-window", "description": "For security reasons, since Gnome 41, cann't invoke '**org.gnome.Shell.Eval**' to control the behavior of window, we expose a D-Bus interface to activate/minimized a window by WMclass name.", "link": "https://extensions.gnome.org/extension/5185/toggle-window/", "shell_version_map": {"42": {"version": "3", "sha256": "03d53mf46jdypbqvw5720cc4ii39q87jscnnnwmqcd2x6sn6c0xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -791,16 +791,16 @@ , {"uuid": "quick-google-meet@gmail.com", "name": "Quick Google Meet", "pname": "quick-google-meet", "description": "Quick open your personal google meet conference. This extension is not affiliated with Google", "link": "https://extensions.gnome.org/extension/5189/quick-google-meet/", "shell_version_map": {"42": {"version": "2", "sha256": "17c0yrnwfanfp8jmmzwk87si5g93bchp7rhf6k2srf788pcbiifr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIG9wZW4geW91ciBwZXJzb25hbCBnb29nbGUgbWVldCBjb25mZXJlbmNlLiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCB3aXRoIEdvb2dsZSIsCiAgIm5hbWUiOiAiUXVpY2sgR29vZ2xlIE1lZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWlzY2VsbGlhbi9xdWljay1nb29nbGUtbWVldCIsCiAgInV1aWQiOiAicXVpY2stZ29vZ2xlLW1lZXRAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "overview-feature-pack@G-dH.github.com", "name": "OFP - Overview Feature Pack", "pname": "ofp-overview-feature-pack", "description": "Adds useful features to the Activities overview and Dash, including powerful window search provider.\n\nKeywords: reorder, workspace, name, move, find windows, app order, app grid, columns, rows, icon, size, thumbnail, force, quit, navigate.", "link": "https://extensions.gnome.org/extension/5192/ofp-overview-feature-pack/", "shell_version_map": {"41": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "1m2zbab8i9njm5nsl6n3kb9pvwmqk95srrm2rsdd85nlb9q3flgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuS2V5d29yZHM6IHJlb3JkZXIsIHdvcmtzcGFjZSwgbmFtZSwgbW92ZSwgZmluZCB3aW5kb3dzLCBhcHAgb3JkZXIsIGFwcCBncmlkLCBjb2x1bW5zLCByb3dzLCBpY29uLCBzaXplLCB0aHVtYm5haWwsIGZvcmNlLCBxdWl0LCBuYXZpZ2F0ZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "weekend-o-meter@coffeverton.gmail.com", "name": "Weekend-O-Meter Revived", "pname": "weekend-o-meter-revived", "description": "Beer timer until next week-end (based on https://extensions.gnome.org/extension/667/weekend-o-meter/)", "link": "https://extensions.gnome.org/extension/5198/weekend-o-meter-revived/", "shell_version_map": {"38": {"version": "1", "sha256": "165chwgiy0wfh12vywgpjz5grlhfkqj7wwc3y672w6qwfdg1hz5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJlZXIgdGltZXIgdW50aWwgbmV4dCB3ZWVrLWVuZCAoYmFzZWQgb24gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjY3L3dlZWtlbmQtby1tZXRlci8pIiwKICAibmFtZSI6ICJXZWVrZW5kLU8tTWV0ZXIgUmV2aXZlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZmZldmVydG9uL3dlZWtlbmQtby1tZXRlciIsCiAgInV1aWQiOiAid2Vla2VuZC1vLW1ldGVyQGNvZmZldmVydG9uLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "time-in-date-menu@knedme", "name": "Time in date menu", "pname": "time-in-date-menu", "description": "Adds current time to date menu.", "link": "https://extensions.gnome.org/extension/5204/time-in-date-menu/", "shell_version_map": {"38": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1shyf64lrrzzb2q72l859yaa1vmlk0galz0p7wfgmf6zcs77jawl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS25lZG1lL1RpbWUtaW4tZGF0ZS1tZW51IiwKICAidXVpZCI6ICJ0aW1lLWluLWRhdGUtbWVudUBrbmVkbWUiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "time-in-date-menu@knedme", "name": "Time in date menu", "pname": "time-in-date-menu", "description": "Adds current time to date menu.", "link": "https://extensions.gnome.org/extension/5204/time-in-date-menu/", "shell_version_map": {"38": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "suspend-to-topbar@madebysteven.nl", "name": "Suspend button in topbar", "pname": "suspend-button-in-top-bar", "description": "Suspend your computer via a topbar button, added settings to the fork for asking to suspend or cancel. Original project: https://github.com/trofosila/suspend-to-topbar", "link": "https://extensions.gnome.org/extension/5213/suspend-button-in-top-bar/", "shell_version_map": {"38": {"version": "4", "sha256": "1gwf4axjwvwmlribsv6g0w1xdifdxxbr5mjjp6yl3xkz6rkbip9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN1c3BlbmQgeW91ciBjb21wdXRlciB2aWEgYSB0b3BiYXIgYnV0dG9uLCBhZGRlZCBzZXR0aW5ncyB0byB0aGUgZm9yayBmb3IgYXNraW5nIHRvIHN1c3BlbmQgb3IgY2FuY2VsLiBPcmlnaW5hbCBwcm9qZWN0OiBodHRwczovL2dpdGh1Yi5jb20vdHJvZm9zaWxhL3N1c3BlbmQtdG8tdG9wYmFyIiwKICAibmFtZSI6ICJTdXNwZW5kIGJ1dHRvbiBpbiB0b3BiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VzcGVuZC10by10b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGV2ZW5kZWpvbmdubC9zdXNwZW5kLXRvLXRvcGJhciIsCiAgInV1aWQiOiAic3VzcGVuZC10by10b3BiYXJAbWFkZWJ5c3RldmVuLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "mutter-primary-gpu@zaidka.github.io", "name": "Mutter Primary GPU", "pname": "mutter-primary-gpu", "description": "Override primary GPU selection for Wayland", "link": "https://extensions.gnome.org/extension/5218/mutter-primary-gpu/", "shell_version_map": {"42": {"version": "3", "sha256": "0i7q860mzk65cbqsm9q29sjg8k6ai8kv715rkw1wb2lx2xig434a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHByaW1hcnkgR1BVIHNlbGVjdGlvbiBmb3IgV2F5bGFuZCIsCiAgIm5hbWUiOiAiTXV0dGVyIFByaW1hcnkgR1BVIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phaWRrYS9tdXR0ZXItcHJpbWFyeS1ncHUiLAogICJ1dWlkIjogIm11dHRlci1wcmltYXJ5LWdwdUB6YWlka2EuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "A resource monitor showing CPU, memory, and network activity in the GNOME top bar.", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1bl4mzwnqphlclv1pq44rgn42mnh2v8979v3mnlybl9km7ksg2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcmVzb3VyY2UgbW9uaXRvciBzaG93aW5nIENQVSwgbWVtb3J5LCBhbmQgbmV0d29yayBhY3Rpdml0eSBpbiB0aGUgR05PTUUgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgIm5hbWUiOiAiVG9wSGF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcGhhdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} +, {"uuid": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "TopHat aims to be an elegant system resource monitor for the GNOME shell. It displays CPU, memory, disk, and network activity in the GNOME top bar.", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "dash-animator@icedman.github.com", "name": "Dash to Dock Animator", "pname": "dash-to-dock-animator", "description": "Animate the icons of dash to dock", "link": "https://extensions.gnome.org/extension/5222/dash-to-dock-animator/", "shell_version_map": {"40": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1630470pa0zr9mvl2dmnc3mnwx17pkwfll0ibas148yvxf0hj0fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gtYW5pbWF0b3IiLAogICJ1dWlkIjogImRhc2gtYW5pbWF0b3JAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "swap-finger-gestures-3-4@icedman.github.com", "name": "Swap Finger Gestures (3 to 4)", "pname": "swap-finger-gestures-3-to-4", "description": "Use 4 fingers swipe to change workspace instead of 3.", "link": "https://extensions.gnome.org/extension/5233/swap-finger-gestures-3-to-4/", "shell_version_map": {"42": {"version": "3", "sha256": "0z6hacg6szlsgfy23i8i8m11qwssiq6n80apbvd7v6c7cmjglvqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSA0IGZpbmdlcnMgc3dpcGUgdG8gY2hhbmdlIHdvcmtzcGFjZSBpbnN0ZWFkIG9mIDMuIiwKICAibmFtZSI6ICJTd2FwIEZpbmdlciBHZXN0dXJlcyAoMyB0byA0KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zd2FwLWZpbmdlci1nZXN0dXJlcy0zLTQiLAogICJ1dWlkIjogInN3YXAtZmluZ2VyLWdlc3R1cmVzLTMtNEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0z6hacg6szlsgfy23i8i8m11qwssiq6n80apbvd7v6c7cmjglvqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSA0IGZpbmdlcnMgc3dpcGUgdG8gY2hhbmdlIHdvcmtzcGFjZSBpbnN0ZWFkIG9mIDMuIiwKICAibmFtZSI6ICJTd2FwIEZpbmdlciBHZXN0dXJlcyAoMyB0byA0KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zd2FwLWZpbmdlci1nZXN0dXJlcy0zLTQiLAogICJ1dWlkIjogInN3YXAtZmluZ2VyLWdlc3R1cmVzLTMtNEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "material-you-theme@asubbiah.com", "name": "Material You Color Theming", "pname": "material-you-color-theming", "description": "Applies generated libadwaita theme from wallpaper using Material You", "link": "https://extensions.gnome.org/extension/5236/material-you-color-theming/", "shell_version_map": {"42": {"version": "14", "sha256": "0nabd98nk22iz4azyqlb53igk3kvygh6fzh1k28ll7y2l1wgzm75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpZXMgZ2VuZXJhdGVkIGxpYmFkd2FpdGEgdGhlbWUgZnJvbSB3YWxscGFwZXIgdXNpbmcgTWF0ZXJpYWwgWW91IiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWF0ZXJpYWwteW91LXRoZW1lIiwKICAibmFtZSI6ICJNYXRlcmlhbCBZb3UgQ29sb3IgVGhlbWluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXZhbmlzaHN1YmJpYWgvbWF0ZXJpYWwteW91LXRoZW1lIiwKICAidXVpZCI6ICJtYXRlcmlhbC15b3UtdGhlbWVAYXN1YmJpYWguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0nabd98nk22iz4azyqlb53igk3kvygh6fzh1k28ll7y2l1wgzm75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpZXMgZ2VuZXJhdGVkIGxpYmFkd2FpdGEgdGhlbWUgZnJvbSB3YWxscGFwZXIgdXNpbmcgTWF0ZXJpYWwgWW91IiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWF0ZXJpYWwteW91LXRoZW1lIiwKICAibmFtZSI6ICJNYXRlcmlhbCBZb3UgQ29sb3IgVGhlbWluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXZhbmlzaHN1YmJpYWgvbWF0ZXJpYWwteW91LXRoZW1lIiwKICAidXVpZCI6ICJtYXRlcmlhbC15b3UtdGhlbWVAYXN1YmJpYWguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "rounded-window-corners@yilozt", "name": "Rounded Window Corners", "pname": "rounded-window-corners", "description": "Add rounded corners for all windows", "link": "https://extensions.gnome.org/extension/5237/rounded-window-corners/", "shell_version_map": {"40": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "1dbqa5a16z88fpks221fyv5a1zhrlrcdgkdmlgl8c42jad8w1bzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "ideapad-controls@azzamalsharafi.gmail.com", "name": "IdeaPad Controls", "pname": "ideapad-controls", "description": "Control Lenovo IdeaPad laptops options: Conservation Mode, Camera Lock, Fn Lock, Touchpad Lock, USB charging", "link": "https://extensions.gnome.org/extension/5260/ideapad-controls/", "shell_version_map": {"42": {"version": "7", "sha256": "0l4chkpyk06ax6jb99vdz9365jn1mvinbcj3lq83df6yq9cwgc19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLUNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BenphbUFsc2hhcmFmaS9pZGVhcGFkLWNvbnRyb2xzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaWRlYXBhZC1jb250cm9sc0BhenphbWFsc2hhcmFmaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0l4chkpyk06ax6jb99vdz9365jn1mvinbcj3lq83df6yq9cwgc19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLUNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BenphbUFsc2hhcmFmaS9pZGVhcGFkLWNvbnRyb2xzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaWRlYXBhZC1jb250cm9sc0BhenphbWFsc2hhcmFmaS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG with GSconnect Integration, Drag and Drop onto Dock (Gtk4-DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Gtk4 Port of Desktop Icons NG with updated and modified code base, uses gio menus, all functions are async where possible, multiple fixes and new features-\n\n* Make Links on Desktop.\n* Copied/dropped/pasted files retain dropped position.\n* Right Click Menus will not go under the dock.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to mobile device.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop or remove from favorites.\n* Improved gesture switching of workspaces, icons appear to be on all workspaces in moving windows.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock or to mounted volumes to copy them directly.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. There is a bug in GJS on X11, please see Readme. This extension now works with some hacks, even on X11. However your mileage may vary and use with caution on X11 and report any issues.\n\nPlease report all issues on the gitlab link below, this page is not monitored.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {"40": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "28", "sha256": "03s3lf5kyr4lvg76czzvy0rpkq7icl9462mz0q6cl3f6208qnrfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "43": {"version": "28", "sha256": "03s3lf5kyr4lvg76czzvy0rpkq7icl9462mz0q6cl3f6208qnrfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} +, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG with GSconnect Integration, Drag and Drop onto Dock (Gtk4-DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Gtk4 Port of Desktop Icons NG with updated and modified code base, uses gio menus, all functions are async where possible, multiple fixes and new features-\n\n* Make Links on Desktop.\n* Copied/dropped/pasted files retain dropped position.\n* Right Click Menus will not go under the dock.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to mobile device.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop or remove from favorites.\n* Improved gesture switching of workspaces, icons appear to be on all workspaces in moving windows.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock or to mounted volumes to copy them directly.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. There is a bug in GJS on X11, please see Readme. This extension now works with some hacks, even on X11. However your mileage may vary and use with caution on X11 and report any issues.\n\nPlease report all issues on the gitlab link below, this page is not monitored.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {"40": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "00jlr91nbiff1zkpryayq07kchk82dgcydrn3xddsxkd6a7qq6zf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "30", "sha256": "1yhb8r9is3441r7q7hb2m7wszn6z7mqp8cixpggymf5li9im8d11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "1yhb8r9is3441r7q7hb2m7wszn6z7mqp8cixpggymf5li9im8d11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": {"41": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "walkpaper2@walkpaper.massimiliano-dalcero.github.com", "name": "Walkpaper2", "pname": "walkpaper2", "description": "Set different wallpaper for each workspace by having the wallpaper switch on workspace change. Forked from the BlinkBP'project (https://github.com/BlinkBP/walkpaper)\n\nUnlike the previous extension is added a delay during transition. Is need for avoid flickering during switch using shortcuts :)", "link": "https://extensions.gnome.org/extension/5267/walkpaper2/", "shell_version_map": {"42": {"version": "7", "sha256": "00z56wfsvw4821siywgg83r9xhyq1sp0dijvd6y2lgg1zf08xkvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4gRm9ya2VkIGZyb20gdGhlIEJsaW5rQlAncHJvamVjdCAoaHR0cHM6Ly9naXRodWIuY29tL0JsaW5rQlAvd2Fsa3BhcGVyKVxuXG5Vbmxpa2UgdGhlIHByZXZpb3VzIGV4dGVuc2lvbiBpcyBhZGRlZCBhIGRlbGF5IGR1cmluZyB0cmFuc2l0aW9uLiBJcyBuZWVkIGZvciBhdm9pZCBmbGlja2VyaW5nIGR1cmluZyBzd2l0Y2ggdXNpbmcgc2hvcnRjdXRzIDopIiwKICAiZXh0ZW5zaW9uLWlkIjogIndhbGtwYXBlcjIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3YWxrcGFwZXIyQHdhbGtwYXBlci5tYXNzaW1pbGlhbm8tZGFsY2Vyby5naXRodWIuY29tIiwKICAibmFtZSI6ICJXYWxrcGFwZXIyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlcjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2ltaWxpYW5vLWRhbGNlcm8vd2Fsa3BhcGVyIiwKICAidXVpZCI6ICJ3YWxrcGFwZXIyQHdhbGtwYXBlci5tYXNzaW1pbGlhbm8tZGFsY2Vyby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "dock-reloaded@selfmade.pl", "name": "Dock: Reloaded", "pname": "dock-reloaded", "description": "Few tweaks to GNOME dock: top position, autohide - reveals under cursor pressure, only favorites apps", "link": "https://extensions.gnome.org/extension/5269/dock-reloaded/", "shell_version_map": {"42": {"version": "2", "sha256": "1cs766qr77i68s53dvaswlyv3jh1sv51d19jgigd7m71qndxwv70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "3", "sha256": "1zs2imsp8jw6z1x5q4c7b6qnrih11d8j09xs1zvfj65dm5ag2nz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldyB0d2Vha3MgdG8gR05PTUUgZG9jazogdG9wIHBvc2l0aW9uLCBhdXRvaGlkZSAtIHJldmVhbHMgdW5kZXIgY3Vyc29yIHByZXNzdXJlLCBvbmx5IGZhdm9yaXRlcyBhcHBzIiwKICAibmFtZSI6ICJEb2NrOiBSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9Eb2NrLVJlbG9hZGVkIiwKICAidXVpZCI6ICJkb2NrLXJlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -821,7 +821,7 @@ , {"uuid": "pingindic@xynium.github.com", "name": "PingIndic", "pname": "pingindic", "description": "show network ping delay", "link": "https://extensions.gnome.org/extension/5330/pingindic/", "shell_version_map": {"42": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "power-profile-indicator@laux.wtf", "name": "Power Profiles Indicator", "pname": "power-profile-indicator", "description": "a simple indicator in the system icons area of the top panel that represent the current power profile", "link": "https://extensions.gnome.org/extension/5335/power-profile-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} -, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "Super Graphics Control", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "24", "sha256": "1xd0mlbca2cg6nxysv8x4kiqkwsb3dw3qw3rv87i81b6n5v26y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAic3VwZXJnZnhjdGwiOiAiNS4wLjEiLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzdXBlcmdmeGN0bC1nZXhAYXN1cy1saW51eC5vcmciLAogICJ1dWlkLWRldiI6ICJzdXBlcmdmeGN0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} +, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "Super Graphics Control", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\r\n\r\nIt is a platform agnostic tool for hybrid graphics laptops.\r\n\r\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\r\n\r\nTo learn more about it, please have a look at:\r\n\r\nhttps://gitlab.com/asus-linux/supergfxctl\r\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "1d3jgx1x8npsk8vj10pv7v5ixarg6p6wzfhll192rxbhfw43qw21", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXHJcblxyXG5JdCBpcyBhIHBsYXRmb3JtIGFnbm9zdGljIHRvb2wgZm9yIGh5YnJpZCBncmFwaGljcyBsYXB0b3BzLlxyXG5cclxuc3VwZXJnZnhjdGwgZ2V0cyBwYWNrYWdlcyBieSB0aGUgY29tbXVuaXR5IGZvciBGZWRvcmEgYW5kIEFyY2guIEJ1dCB3aXRob3V0IG11Y2ggb2YgYSBoYXN0bGUgY2FuIGJlIGNvbXBpbGVkIGZvciBldmVyeSBzeXN0ZW1kIGJhc2VkIExpbnV4IGRpc3RyaWJ1dGlvbi5cclxuXHJcblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcclxuXHJcbmh0dHBzOi8vZ2l0bGFiLmNvbS9hc3VzLWxpbnV4L3N1cGVyZ2Z4Y3RsXHJcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "1d3jgx1x8npsk8vj10pv7v5ixarg6p6wzfhll192rxbhfw43qw21", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXHJcblxyXG5JdCBpcyBhIHBsYXRmb3JtIGFnbm9zdGljIHRvb2wgZm9yIGh5YnJpZCBncmFwaGljcyBsYXB0b3BzLlxyXG5cclxuc3VwZXJnZnhjdGwgZ2V0cyBwYWNrYWdlcyBieSB0aGUgY29tbXVuaXR5IGZvciBGZWRvcmEgYW5kIEFyY2guIEJ1dCB3aXRob3V0IG11Y2ggb2YgYSBoYXN0bGUgY2FuIGJlIGNvbXBpbGVkIGZvciBldmVyeSBzeXN0ZW1kIGJhc2VkIExpbnV4IGRpc3RyaWJ1dGlvbi5cclxuXHJcblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcclxuXHJcbmh0dHBzOi8vZ2l0bGFiLmNvbS9hc3VzLWxpbnV4L3N1cGVyZ2Z4Y3RsXHJcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "1d3jgx1x8npsk8vj10pv7v5ixarg6p6wzfhll192rxbhfw43qw21", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXHJcblxyXG5JdCBpcyBhIHBsYXRmb3JtIGFnbm9zdGljIHRvb2wgZm9yIGh5YnJpZCBncmFwaGljcyBsYXB0b3BzLlxyXG5cclxuc3VwZXJnZnhjdGwgZ2V0cyBwYWNrYWdlcyBieSB0aGUgY29tbXVuaXR5IGZvciBGZWRvcmEgYW5kIEFyY2guIEJ1dCB3aXRob3V0IG11Y2ggb2YgYSBoYXN0bGUgY2FuIGJlIGNvbXBpbGVkIGZvciBldmVyeSBzeXN0ZW1kIGJhc2VkIExpbnV4IGRpc3RyaWJ1dGlvbi5cclxuXHJcblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcclxuXHJcbmh0dHBzOi8vZ2l0bGFiLmNvbS9hc3VzLWxpbnV4L3N1cGVyZ2Z4Y3RsXHJcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "24", "sha256": "0xzkpgdi5kqf2kbwjaz03m3mm3xxip8avssfw5ij9dfxqqg39yzf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXHJcblxyXG5JdCBpcyBhIHBsYXRmb3JtIGFnbm9zdGljIHRvb2wgZm9yIGh5YnJpZCBncmFwaGljcyBsYXB0b3BzLlxyXG5cclxuc3VwZXJnZnhjdGwgZ2V0cyBwYWNrYWdlcyBieSB0aGUgY29tbXVuaXR5IGZvciBGZWRvcmEgYW5kIEFyY2guIEJ1dCB3aXRob3V0IG11Y2ggb2YgYSBoYXN0bGUgY2FuIGJlIGNvbXBpbGVkIGZvciBldmVyeSBzeXN0ZW1kIGJhc2VkIExpbnV4IGRpc3RyaWJ1dGlvbi5cclxuXHJcblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcclxuXHJcbmh0dHBzOi8vZ2l0bGFiLmNvbS9hc3VzLWxpbnV4L3N1cGVyZ2Z4Y3RsXHJcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAic3VwZXJnZnhjdGwiOiAiNS4wLjEiLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzdXBlcmdmeGN0bC1nZXhAYXN1cy1saW51eC5vcmciLAogICJ1dWlkLWRldiI6ICJzdXBlcmdmeGN0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "dotspaces@charlieqle", "name": "Dotspaces", "pname": "dotspaces", "description": "A simple workspace switcher", "link": "https://extensions.gnome.org/extension/5347/dotspaces/", "shell_version_map": {"42": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and positions. Useful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by saving window state periodically and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {"42": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "vpn-status@peterroux.com", "name": "VPN Status", "pname": "vpn-status", "description": "A VPN Status indicator.", "link": "https://extensions.gnome.org/extension/5356/vpn-status/", "shell_version_map": {"38": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -833,26 +833,26 @@ , {"uuid": "gnome-pushover-messages-unofficial@iwont.cyou", "name": "Pushover Message Notifications", "pname": "pushover-message-notifications", "description": "Displays Pushover Notifications within GNOME and within your tray. Privacy respecting unofficial client.", "link": "https://extensions.gnome.org/extension/5377/pushover-message-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "notification-filter@asynclink.org", "name": "Notification Filter", "pname": "notification-filter", "description": "Filter out notifications by their text content to block them from appearing.\nIf you've ever been annoyed by certain notifications distracting you, this extension gives you more fine tuned control of which notifications to prevent from showing up.\n\nGives you the ability to filter by both the title and body content, use regex matching, and add multiple different filters.\n\nNote: Only prevents new notifications from appearing, does not remove existing notifications.", "link": "https://extensions.gnome.org/extension/5380/notification-filter/", "shell_version_map": {"40": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "evpn-assistant@xytrexl.com", "name": "ExpressVPN - EVPN Shell Assistant", "pname": "evpn-shell-assistant", "description": "Allows ExpressVPN to be controlled through the GNOME shell.", "link": "https://extensions.gnome.org/extension/5385/evpn-shell-assistant/", "shell_version_map": {"42": {"version": "3", "sha256": "07ag6pk024xhhbxyrn5vrfmg1qx6rfyf5xnl6fhcp3rardzkakgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBFeHByZXNzVlBOIHRvIGJlIGNvbnRyb2xsZWQgdGhyb3VnaCB0aGUgR05PTUUgc2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWV2cG4tYXNzaXN0YW50IiwKICAibmFtZSI6ICJFeHByZXNzVlBOIC0gRVZQTiBTaGVsbCBBc3Npc3RhbnQiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiU3R1YXJ0IEdpbG1vdXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXZwbi1hc3Npc3RhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0amFtZXNnaWxtb3VyL2V2cG4tYXNzaXN0YW50IiwKICAidXVpZCI6ICJldnBuLWFzc2lzdGFudEB4eXRyZXhsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "screen-rotate@shyzus.github.io", "name": "Screen Rotate", "pname": "screen-rotate", "description": "Enable screen rotation regardless of touch mode. Fork of Screen Autorotate by Kosmospredanie.", "link": "https://extensions.gnome.org/extension/5389/screen-rotate/", "shell_version_map": {"40": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "screen-rotate@shyzus.github.io", "name": "Screen Rotate", "pname": "screen-rotate", "description": "Enable screen rotation regardless of touch mode. Fork of Screen Autorotate by Kosmospredanie.", "link": "https://extensions.gnome.org/extension/5389/screen-rotate/", "shell_version_map": {"40": {"version": "9", "sha256": "1cp3cm8zxdqfbnmgd0vh7s5px1vlmhkkj0wr3wv397kixcn9wgad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1cp3cm8zxdqfbnmgd0vh7s5px1vlmhkkj0wr3wv397kixcn9wgad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1cp3cm8zxdqfbnmgd0vh7s5px1vlmhkkj0wr3wv397kixcn9wgad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1cp3cm8zxdqfbnmgd0vh7s5px1vlmhkkj0wr3wv397kixcn9wgad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and current time in milliseconds as a shell extension.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": {"42": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "inhibit-suspend@charlieqle", "name": "Inhibit Suspend", "pname": "inhibit-suspend", "description": "Inhibit autosuspend at the press of a button", "link": "https://extensions.gnome.org/extension/5397/inhibit-suspend/", "shell_version_map": {"43": {"version": "3", "sha256": "0xp3b7i46lsvxkgsk3z3lx1k1zymnwm8hnsl1v39j01zsxyh2fnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluaGliaXQgYXV0b3N1c3BlbmQgYXQgdGhlIHByZXNzIG9mIGEgYnV0dG9uIiwKICAibmFtZSI6ICJJbmhpYml0IFN1c3BlbmQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5oaWJpdC1zdXNwZW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NoYXJsaWVRTGUvZ25vbWUtZXh0ZW5zaW9uLWluaGliaXQtc3VzcGVuZCIsCiAgInV1aWQiOiAiaW5oaWJpdC1zdXNwZW5kQGNoYXJsaWVxbGUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "gtk3-theme-switcher@charlieqle", "name": "GTK3 Theme Switcher", "pname": "gtk3-theme-switcher", "description": "A simple GTK 3.0 theme switcher", "link": "https://extensions.gnome.org/extension/5401/gtk3-theme-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "grand-theft-focus@zalckos.github.com", "name": "Grand Theft Focus", "pname": "grand-theft-focus", "description": "Removes the 'Window is ready' notification and brings the window into focus instead.", "link": "https://extensions.gnome.org/extension/5410/grand-theft-focus/", "shell_version_map": {"40": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QR Code", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QR Code of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QR Code and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone).", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QR Code", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QR Code of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QR Code and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone). \n\nFrom version 4 added a functionality to copy the QR Code to clipboard with right click on it.", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "eos-desktop@endlessm.com", "name": "Endless Desktop", "pname": "endless-desktop", "description": "Endless OS signature desktop", "link": "https://extensions.gnome.org/extension/5419/endless-desktop/", "shell_version_map": {"41": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "batterytime@typeof.pw", "name": "Battery Time", "pname": "battery-time", "description": "Get estimated battery remaining time back on quick menu.\n\nWhen computer is on battery or is charging, the remaining time or time to full will be shown in quick menu.", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": {"43": {"version": "1", "sha256": "1wv56yaws3vrpwp0hr7s9gb4w8kwrnwhirwd7k3i5vvf7w707d3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBlc3RpbWF0ZWQgYmF0dGVyeSByZW1haW5pbmcgdGltZSBiYWNrIG9uIHF1aWNrIG1lbnUuXG5cbldoZW4gY29tcHV0ZXIgaXMgb24gYmF0dGVyeSBvciBpcyBjaGFyZ2luZywgdGhlIHJlbWFpbmluZyB0aW1lIG9yIHRpbWUgdG8gZnVsbCB3aWxsIGJlIHNob3duIGluIHF1aWNrIG1lbnUuIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "onedrive@diegomerida.com", "name": "One Drive Resurrect", "pname": "one-drive-resurrect", "description": "One Drive extension. This extension is not affiliated, funded, or in any way associated with Microsoft and OneDrive.", "link": "https://extensions.gnome.org/extension/5428/one-drive-resurrect/", "shell_version_map": {"41": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "warpswitcher@pikokr.dev", "name": "Cloudflare Warp Quick Settings", "pname": "cloudflare-warp-quick-settings", "description": "Toggle cloudflare warp in quick settings\n\nThe logo is from cloudflare(https://www.cloudflare.com). This extension is not affiliated, funded, or in any way associated with Cloudflare.", "link": "https://extensions.gnome.org/extension/5440/cloudflare-warp-quick-settings/", "shell_version_map": {"43": {"version": "4", "sha256": "085gv1v514ibiyn8vbbd99217ddnlmw80690swz50kk07bfkkb3q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBjbG91ZGZsYXJlIHdhcnAgaW4gcXVpY2sgc2V0dGluZ3NcblxuVGhlIGxvZ28gaXMgZnJvbSBjbG91ZGZsYXJlKGh0dHBzOi8vd3d3LmNsb3VkZmxhcmUuY29tKS4gVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggQ2xvdWRmbGFyZS4iLAogICJuYW1lIjogIkNsb3VkZmxhcmUgV2FycCBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waWtva3IvY2xvdWRmbGFyZS13YXJwLXF1aWNrc2V0dGluZ3MiLAogICJ1dWlkIjogIndhcnBzd2l0Y2hlckBwaWtva3IuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "quick-settings-button-remover@qwreey", "name": "Quick Settings Button Remover (DEPRECATED)", "pname": "quick-settings-button-remover", "description": "This extensions is DEPRECATED!\nUse this extension instead:\nhttps://extensions.gnome.org/extension/5446/quick-settings-tweaker/", "link": "https://extensions.gnome.org/extension/5443/quick-settings-button-remover/", "shell_version_map": {"43": {"version": "1", "sha256": "1mdyycav4y70qqjn0dppczcywydy7d9nj78zgvfkp5870hgvws51", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9ucyBpcyBERVBSRUNBVEVEIVxuVXNlIHRoaXMgZXh0ZW5zaW9uIGluc3RlYWQ6XG5odHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NDQ2L3F1aWNrLXNldHRpbmdzLXR3ZWFrZXIvIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBCdXR0b24gUmVtb3ZlciAoREVQUkVDQVRFRCkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucXVpY2stc2V0dGluZ3MtYnV0dG9uLXJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcXdyZWV5NzUvZ25vbWUtcXVpY2stc2V0dGluZ3MtYnV0dG9uLXJlbW92ZXIiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLWJ1dHRvbi1yZW1vdmVyQHF3cmVleSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quick-settings-tweaks@qwreey", "name": "Quick Settings Tweaker", "pname": "quick-settings-tweaker", "description": "Let's tweak gnome 43's quick settings! You can add Media Controls, Notifications, Volume Mixer on quick settings and remove useless buttons!", "link": "https://extensions.gnome.org/extension/5446/quick-settings-tweaker/", "shell_version_map": {"43": {"version": "17", "sha256": "1b3x4zqfyzph7x3r3kr3m2m07hralfazpazx5950iiscmx5s4cbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCdzIHR3ZWFrIGdub21lIDQzJ3MgcXVpY2sgc2V0dGluZ3MhIFlvdSBjYW4gYWRkIE1lZGlhIENvbnRyb2xzLCBOb3RpZmljYXRpb25zLCBWb2x1bWUgTWl4ZXIgb24gcXVpY2sgc2V0dGluZ3MgYW5kIHJlbW92ZSB1c2VsZXNzIGJ1dHRvbnMhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtdHdlYWtzIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBUd2Vha2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1aWNrLXNldHRpbmdzLXR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9xd3JlZXk3NS9xdWljay1zZXR0aW5ncy10d2Vha3MiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLXR3ZWFrc0Bxd3JlZXkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} -, {"uuid": "osd-volume-number@deminder", "name": "OSD Volume Number", "pname": "osd-volume-number", "description": "Replace the on-screen-display volume level icon with a number.", "link": "https://extensions.gnome.org/extension/5461/osd-volume-number/", "shell_version_map": {"42": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "next-up@artisticat1.github.com", "name": "Next Up", "pname": "next-up", "description": "Show your next calendar event in the status bar", "link": "https://extensions.gnome.org/extension/5465/next-up/", "shell_version_map": {"42": {"version": "2", "sha256": "1p8r4lly20azdl82a2724gdj0rczinccch509dhzvb2j859y7xqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydGlzdGljYXQxL2dub21lLW5leHQtdXAiLAogICJ1dWlkIjogIm5leHQtdXBAYXJ0aXN0aWNhdDEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "osd-volume-number@deminder", "name": "OSD Volume Number", "pname": "osd-volume-number", "description": "Replace the on-screen-display volume level icon with a number.", "link": "https://extensions.gnome.org/extension/5461/osd-volume-number/", "shell_version_map": {"42": {"version": "2", "sha256": "0j1pwzdhsg0vg1rv2bb2y5kd3mx6cr84g1va79m7iylp7ij0hkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0j1pwzdhsg0vg1rv2bb2y5kd3mx6cr84g1va79m7iylp7ij0hkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "next-up@artisticat1.github.com", "name": "Next Up", "pname": "next-up", "description": "Show your next calendar event in the status bar", "link": "https://extensions.gnome.org/extension/5465/next-up/", "shell_version_map": {"42": {"version": "3", "sha256": "0846mjjqvvh4qycr9cbnwpvqck99qcjjdd0w4xlbjcnixnxkws13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnRpc3RpY2F0MS9nbm9tZS1uZXh0LXVwIiwKICAidXVpZCI6ICJuZXh0LXVwQGFydGlzdGljYXQxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0846mjjqvvh4qycr9cbnwpvqck99qcjjdd0w4xlbjcnixnxkws13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnRpc3RpY2F0MS9nbm9tZS1uZXh0LXVwIiwKICAidXVpZCI6ICJuZXh0LXVwQGFydGlzdGljYXQxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "weatheroclock@CleoMenezesJr.github.io", "name": "Weather O'Clock", "pname": "weather-oclock", "description": "Display the current weather inside the pill next to the clock. GNOME Weather is required for this extension to work.", "link": "https://extensions.gnome.org/extension/5470/weather-oclock/", "shell_version_map": {"42": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "appmenu-color-icon@arahiko-ayami.github.com", "name": "Color App Menu Icon for GNOME 40+", "pname": "color-app-menu-icon-for-gnome-40", "description": "Replace the symbolic application menu icon with the regular one. An alternative version of yanbab's extension that supports GNOME 40 and higher", "link": "https://extensions.gnome.org/extension/5473/color-app-menu-icon-for-gnome-40/", "shell_version_map": {"38": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "toggle-workspace-span@arngo.github.com", "name": "Toggle workspace span", "pname": "toggle-workspace-span", "description": "Toggle workspaces spanning displays (aka \"Workspaces on primary display only/Workspaces on all displays\").\n\nThe button can be set to show either on the panel or in the quick settings menu.", "link": "https://extensions.gnome.org/extension/5482/toggle-workspace-span/", "shell_version_map": {"43": {"version": "2", "sha256": "19wca76p0rx2qm1dh1yz5rhrdfkdqf0s470d6lhlaj0c8j86bjr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3b3Jrc3BhY2VzIHNwYW5uaW5nIGRpc3BsYXlzIChha2EgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5L1dvcmtzcGFjZXMgb24gYWxsIGRpc3BsYXlzXCIpLlxuXG5UaGUgYnV0dG9uIGNhbiBiZSBzZXQgdG8gc2hvdyBlaXRoZXIgb24gdGhlIHBhbmVsIG9yIGluIHRoZSBxdWljayBzZXR0aW5ncyBtZW51LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIHdvcmtzcGFjZSBzcGFuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FybmdvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10b2dnbGUtd29ya3NwYWNlLXNwYW4iLAogICJ1dWlkIjogInRvZ2dsZS13b3Jrc3BhY2Utc3BhbkBhcm5nby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "search-light@icedman.github.com", "name": "Search Light", "pname": "search-light", "description": "Take the apps search out of overview", "link": "https://extensions.gnome.org/extension/5489/search-light/", "shell_version_map": {"42": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "ibus-switcher@kevinhwang91.github.com", "name": "Ibus Switcher", "pname": "ibus-switcher", "description": "Use d-bus to switch ibus source", "link": "https://extensions.gnome.org/extension/5497/ibus-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "0f3w2jzrhr2jk08955cnv6kkxsk6qh0ramri6k5r75qyjg1hayz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJhMGIzZTdhY2Q0Y2ZiMmI4OTA3ZjE2ZjBiZjA3MDk4MGIyNzdlYTBjIiwKICAiZGVzY3JpcHRpb24iOiAiVXNlIGQtYnVzIHRvIHN3aXRjaCBpYnVzIHNvdXJjZSIsCiAgIm5hbWUiOiAiSWJ1cyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5od2FuZzkxL2dub21lLXNoZWxsLWlidXMtc3dpdGNoZXIiLAogICJ1dWlkIjogImlidXMtc3dpdGNoZXJAa2V2aW5od2FuZzkxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "43": {"version": "1", "sha256": "0f3w2jzrhr2jk08955cnv6kkxsk6qh0ramri6k5r75qyjg1hayz2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJhMGIzZTdhY2Q0Y2ZiMmI4OTA3ZjE2ZjBiZjA3MDk4MGIyNzdlYTBjIiwKICAiZGVzY3JpcHRpb24iOiAiVXNlIGQtYnVzIHRvIHN3aXRjaCBpYnVzIHNvdXJjZSIsCiAgIm5hbWUiOiAiSWJ1cyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5od2FuZzkxL2dub21lLXNoZWxsLWlidXMtc3dpdGNoZXIiLAogICJ1dWlkIjogImlidXMtc3dpdGNoZXJAa2V2aW5od2FuZzkxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "auto-activities@CleoMenezesJr.github.io", "name": "Auto Activities", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\nThis extension is a fork of the Auto Activities extension, its former owner transferred its repository to me.", "link": "https://extensions.gnome.org/extension/5500/auto-activities/", "shell_version_map": {"42": {"version": "4", "sha256": "0icdhqn4w0b2i153xqn34bhbpkam1klawxr2p6hs6wcr05cmx6z6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0icdhqn4w0b2i153xqn34bhbpkam1klawxr2p6hs6wcr05cmx6z6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "auto-activities@CleoMenezesJr.github.io", "name": "Auto Activities", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\nThis extension is a fork of the Auto Activities extension, its former owner transferred its repository to me.", "link": "https://extensions.gnome.org/extension/5500/auto-activities/", "shell_version_map": {"42": {"version": "7", "sha256": "15i34wk3b9d7dhkmbxnkv1f21hsrk4bckhvndd9jn2i1kf217x3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "15i34wk3b9d7dhkmbxnkv1f21hsrk4bckhvndd9jn2i1kf217x3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "quick-settings-avatar@d-go", "name": "User Avatar In Quick Settings", "pname": "user-avatar-in-quick-settings", "description": "Display the user avatar in the Quick Settings menu, part of the \"System\" settings", "link": "https://extensions.gnome.org/extension/5506/user-avatar-in-quick-settings/", "shell_version_map": {"43": {"version": "3", "sha256": "194b4z6ixp0h07qcdrh53yj0sr4n717ap4vqgypaarcrnc4dfm9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kLWdvL3F1aWNrLXNldHRpbmdzLWF2YXRhciIsCiAgInV1aWQiOiAicXVpY2stc2V0dGluZ3MtYXZhdGFyQGQtZ28iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "eur-brl@jcanabarro.github.com", "name": "EUR-BRL", "pname": "eur-brl", "description": "Gnome Extension that shows the current conversion of Euro to Brazilian Reals.\n\nIt is a fork of USD-BRL https://extensions.gnome.org/extension/5371/usd-bra/", "link": "https://extensions.gnome.org/extension/5510/eur-brl/", "shell_version_map": {"42": {"version": "2", "sha256": "0j5wx3dawlxdal6rw7ijh17wbpakdy3qwh634ns9q65a7axqalkz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0aGF0IHNob3dzIHRoZSBjdXJyZW50IGNvbnZlcnNpb24gb2YgRXVybyB0byBCcmF6aWxpYW4gUmVhbHMuXG5cbkl0IGlzIGEgZm9yayBvZiBVU0QtQlJMIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzUzNzEvdXNkLWJyYS8iLAogICJuYW1lIjogIkVVUi1CUkwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamNhbmFiYXJyby9FVVItQlJMIiwKICAidXVpZCI6ICJldXItYnJsQGpjYW5hYmFycm8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "floating-panel@aylur", "name": "Floating Panel", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5514/floating-panel/", "shell_version_map": {"40": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0jih9lhy9pywilqnkz4cliyg3i2jm4w36kmna67hrx5wqvga6s69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -866,15 +866,15 @@ , {"uuid": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "Custom Accent Color support for GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": {"43": {"version": "4", "sha256": "07mfm8k43l87xffq5x87mvd65hgyc678zkkw5iqxlv2gh51dpbwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbSBBY2NlbnQgQ29sb3Igc3VwcG9ydCBmb3IgR1RLNC9HVEszIGFwcHMgYW5kIHRoZSBHbm9tZSBTaGVsbC4iLAogICJuYW1lIjogIkN1c3RvbSBBY2NlbnQgQ29sb3JzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbWlza3AvY3VzdG9tLWFjY2VudC1jb2xvcnMiLAogICJ1dWlkIjogImN1c3RvbS1hY2NlbnQtY29sb3JzQGRlbWlza3AiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "dynamic-calendar-and-clocks-icons@fcusr.github.com", "name": "Dynamic Calendar, Clocks and Weather Icons", "pname": "dynamic-calendar-and-clocks-icons", "description": "Let Calendar, Clocks and Weather icons show current date, time and weather.", "link": "https://extensions.gnome.org/extension/5550/dynamic-calendar-and-clocks-icons/", "shell_version_map": {"43": {"version": "6", "sha256": "07vkbmyi2bxh6328qn01gwvm2anhpnkknhhdy97qqd5si10csv83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIGljb25zIHNob3cgY3VycmVudCBkYXRlLCB0aW1lIGFuZCB3ZWF0aGVyLiIsCiAgIm5hbWUiOiAiRHluYW1pYyBDYWxlbmRhciwgQ2xvY2tzIGFuZCBXZWF0aGVyIEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZjdXNyL2R5bmFtaWMtY2FsZW5kYXItYW5kLWNsb2Nrcy1pY29ucyIsCiAgInV1aWQiOiAiZHluYW1pYy1jYWxlbmRhci1hbmQtY2xvY2tzLWljb25zQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "showmethetext@Guleri24.github.com", "name": "Show Me The Text", "pname": "show-me-the-text", "description": "Shows desired text on the right side of the top bar ;-)", "link": "https://extensions.gnome.org/extension/5556/show-me-the-text/", "shell_version_map": {"42": {"version": "2", "sha256": "0wcxzizbjc54i956kml1f3insbkri6fz34xbcm1iiaw2p3q0f9fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRlc2lyZWQgdGV4dCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgdG9wIGJhciA7LSkiLAogICJuYW1lIjogIlNob3cgTWUgVGhlIFRleHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvd21ldGhldGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VsZXJpMjQvc2hvdy1tZS10aGUtdGV4dCIsCiAgInV1aWQiOiAic2hvd21ldGhldGV4dEBHdWxlcmkyNC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "0wcxzizbjc54i956kml1f3insbkri6fz34xbcm1iiaw2p3q0f9fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRlc2lyZWQgdGV4dCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgdG9wIGJhciA7LSkiLAogICJuYW1lIjogIlNob3cgTWUgVGhlIFRleHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvd21ldGhldGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VsZXJpMjQvc2hvdy1tZS10aGUtdGV4dCIsCiAgInV1aWQiOiAic2hvd21ldGhldGV4dEBHdWxlcmkyNC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "ziion@halborn.com", "name": "ZIIONext", "pname": "ziionext", "description": "GNOME extension for branding and customisation of Ziion\nThe smart contract auditing VM used by https://halborn.com.\n\nThis extension is a heavily modified fork of https://github.com/Aryan20/Logomenu and uses it as a base. Get more information on ZIION at https://ziion.org.", "link": "https://extensions.gnome.org/extension/5559/ziionext/", "shell_version_map": {"38": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1va05s7320h1j2ryzcnhcp4hy9sfn3aw9vcyvn7qpjqb9cp1vj27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxib3JubGFicy9aSUlPTmV4dCIsCiAgInV1aWQiOiAiemlpb25AaGFsYm9ybi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "ziion@halborn.com", "name": "ZIIONext", "pname": "ziionext", "description": "GNOME extension for branding and customisation of Ziion\nThe smart contract auditing VM used by https://halborn.com.\n\nThis extension is a heavily modified fork of https://github.com/Aryan20/Logomenu and uses it as a base. Get more information on ZIION at https://ziion.org.", "link": "https://extensions.gnome.org/extension/5559/ziionext/", "shell_version_map": {"38": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "window-app-switcher-on-active-monitor@NiKnights.com", "name": "Window/App switcher on active monitor", "pname": "monitor-window-switcher-2", "description": "GNOME shell extension that puts the Window/App switcher on the active monitor (monitor with the cursor).\n\nThis extension is a fork of https://github.com/gedzeppelin/monitor-window-switcher.", "link": "https://extensions.gnome.org/extension/5568/monitor-window-switcher-2/", "shell_version_map": {"38": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "focus-window@chris.al", "name": "Focus Window", "pname": "focus-window", "description": "Do you want a pulldown mode on your terminal without having to switch to tilda or guake? Do you want to focus your Spotify app or email client with a single shortcut key? Then this extension is for you!\n\nThis extension allows one to create various shortcuts for applications, enabling the ability to have one shortcut that triggers both the launch and focus of an application window.", "link": "https://extensions.gnome.org/extension/5571/focus-window/", "shell_version_map": {"42": {"version": "1", "sha256": "1lyz695wqn8zlcbdk9f0c94jmxq9czgnc71s9cndd6vw73pz7z4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvIHlvdSB3YW50IGEgcHVsbGRvd24gbW9kZSBvbiB5b3VyIHRlcm1pbmFsIHdpdGhvdXQgaGF2aW5nIHRvIHN3aXRjaCB0byB0aWxkYSBvciBndWFrZT8gRG8geW91IHdhbnQgdG8gZm9jdXMgeW91ciBTcG90aWZ5IGFwcCBvciBlbWFpbCBjbGllbnQgd2l0aCBhIHNpbmdsZSBzaG9ydGN1dCBrZXk/IFRoZW4gdGhpcyBleHRlbnNpb24gaXMgZm9yIHlvdSFcblxuVGhpcyBleHRlbnNpb24gYWxsb3dzIG9uZSB0byBjcmVhdGUgdmFyaW91cyBzaG9ydGN1dHMgZm9yIGFwcGxpY2F0aW9ucywgZW5hYmxpbmcgdGhlIGFiaWxpdHkgdG8gaGF2ZSBvbmUgc2hvcnRjdXQgdGhhdCB0cmlnZ2VycyBib3RoIHRoZSBsYXVuY2ggYW5kIGZvY3VzIG9mIGFuIGFwcGxpY2F0aW9uIHdpbmRvdy4iLAogICJuYW1lIjogIkZvY3VzIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wY2Jvd2Vycy9mb2N1cy13aW5kb3ciLAogICJ1dWlkIjogImZvY3VzLXdpbmRvd0BjaHJpcy5hbCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "power-profile-switcher@eliapasquali.github.io", "name": "Power Profile Switcher", "pname": "power-profile-switcher", "description": "Automatically switch between power profiles based on power supply and percentage.", "link": "https://extensions.gnome.org/extension/5575/power-profile-switcher/", "shell_version_map": {"42": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "focused-window-dbus@flexagoon.com", "name": "Focused Window D-Bus", "pname": "focused-window-d-bus", "description": "Exposes a D-Bus method to get active window title and class", "link": "https://extensions.gnome.org/extension/5592/focused-window-d-bus/", "shell_version_map": {"43": {"version": "2", "sha256": "148xqala2fkjgvzn4nnq0nhq8vp6nc2yfrimg3cpwlgp2zi0g7cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbGV4YWdvb24vZm9jdXNlZC13aW5kb3ctZGJ1cyIsCiAgInV1aWQiOiAiZm9jdXNlZC13aW5kb3ctZGJ1c0BmbGV4YWdvb24uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "multimonitorswap@dvrlabs.tv", "name": "Multi Monitor Swap ", "pname": "multi-monitor-swap", "description": "Swap windows between monitors.", "link": "https://extensions.gnome.org/extension/5597/multi-monitor-swap/", "shell_version_map": {"40": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "osktouchpad@francescocaracciolo.uno", "name": "OSK/Touchpad inverse toggle", "pname": "osktouchpad-inverse-toggle", "description": "This extension enables On Screek Keyboard from accessibility settings when touchpad is turned off, and disables it when it's on. Useful for 2 in 1 when tablet mode is not properly recognized.", "link": "https://extensions.gnome.org/extension/5603/osktouchpad-inverse-toggle/", "shell_version_map": {"40": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "tado-gnome-shell-extension@fio.ie", "name": "Tado°", "pname": "tado", "description": "Manages Tado° home heating. This extension is not affiliated, funded, or in any way associated with Tado", "link": "https://extensions.gnome.org/extension/5606/tado/", "shell_version_map": {"43": {"version": "7", "sha256": "1259rvgj9lbb354avj76wdgizg01cas4fj7wdnd7j8qlgx0k68yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBUYWRvIiwKICAibmFtZSI6ICJUYWRvXHUwMGIwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rtem9uZWlsbC90YWRvLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb25AZmlvLmllIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "tado-gnome-shell-extension@fio.ie", "name": "Tado°", "pname": "tado", "description": "Manages Tado° home heating. This extension is not affiliated, funded, or in any way associated with Tado", "link": "https://extensions.gnome.org/extension/5606/tado/", "shell_version_map": {"43": {"version": "8", "sha256": "0mi3csynk46s78bsg8v2ha8mc6s3mg5yhh3wgk07m6f2xip9jf2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBUYWRvIiwKICAibmFtZSI6ICJUYWRvXHUwMGIwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rtem9uZWlsbC90YWRvLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb25AZmlvLmllIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "indicate-focus@leleat-on-github", "name": "Focus Indicator", "pname": "focus-indicator", "description": "See https://discourse.gnome.org/t/window-focus-call-for-testing/13277/78. The experiment ended.", "link": "https://extensions.gnome.org/extension/5612/focus-indicator/", "shell_version_map": {"43": {"version": "10", "sha256": "019wv94p74ynyqgg1jarrb36k648vpxv4n7wyp45x2nxxnxm5g8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBodHRwczovL2Rpc2NvdXJzZS5nbm9tZS5vcmcvdC93aW5kb3ctZm9jdXMtY2FsbC1mb3ItdGVzdGluZy8xMzI3Ny83OC4gVGhlIGV4cGVyaW1lbnQgZW5kZWQuIiwKICAibmFtZSI6ICJGb2N1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5kaWNhdGUtZm9jdXMtcHJvdG90eXBlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9mb2N1cy1pbmRpY2F0b3ItcHJvdG90eXBlIiwKICAidXVpZCI6ICJpbmRpY2F0ZS1mb2N1c0BsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "battery-indicator@jgotti.org", "name": "Battery indicator (upower)", "pname": "battery-indicator-upower", "description": "Display battery level indicators for connected devices (such as mouse, keyboard, game controller, touchpad ...) as reported by upower.\n\nDefault refresh time is 5 minutes but can be changed in settings. Informations that are displayed in italic reflect information that upower report as \"should ignore\", as sometimes informations reported by upower are not that reliable. \n\nAdditionnaly you can simply click devices in the popup menu to set their display in the indicator, the checkmark reflect whether it will be displayed or not (will always display at least on device).\n\nmore info at https://github.com/malko/battery-indicator-upower", "link": "https://extensions.gnome.org/extension/5615/battery-indicator-upower/", "shell_version_map": {"42": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "visualizer@sound.org", "name": "Sound Visualizer", "pname": "sound-visualizer", "description": "A Real Time Sound Visualizer Based On Gstreamer\nFor any Issues,Bugs and Suggestions please open an issue on Github", "link": "https://extensions.gnome.org/extension/5624/sound-visualizer/", "shell_version_map": {"38": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -882,7 +882,7 @@ , {"uuid": "imageoverlay@nw.nwhirschfeld.de", "name": "Image Overlay", "pname": "image-overlay", "description": "This GNOME Shell extension allows you to configure multiple images as overlays and bind them to keyboard shortcuts. Possible use cases include quickly accessing cheat sheets or covering your work.", "link": "https://extensions.gnome.org/extension/5630/image-overlay/", "shell_version_map": {"43": {"version": "2", "sha256": "10b748x6kjrmwbwdsbsz1ld2cs9kyvz5qxckw43r33n98h33i2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIG11bHRpcGxlIGltYWdlcyBhcyBvdmVybGF5cyBhbmQgYmluZCB0aGVtIHRvIGtleWJvYXJkIHNob3J0Y3V0cy4gUG9zc2libGUgdXNlIGNhc2VzIGluY2x1ZGUgcXVpY2tseSBhY2Nlc3NpbmcgY2hlYXQgc2hlZXRzIG9yIGNvdmVyaW5nIHlvdXIgd29yay4iLAogICJuYW1lIjogIkltYWdlIE92ZXJsYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1hZ2VvdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL253aGlyc2NoZmVsZC9JbWFnZS1PdmVybGF5IiwKICAidXVpZCI6ICJpbWFnZW92ZXJsYXlAbncubndoaXJzY2hmZWxkLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "stonks@0x41ndrea.gitlab.com", "name": "Stonks", "pname": "stonks", "description": "Stonks is an extension for tracking the latest price of your favourite stocks using finance.yahoo.com API", "link": "https://extensions.gnome.org/extension/5633/stonks/", "shell_version_map": {"43": {"version": "2", "sha256": "11i0x7gakgq9q84548zhmdncm0l8dhjyhn9cpgxs92cvlqhyd4yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b25rcyBpcyBhbiBleHRlbnNpb24gZm9yIHRyYWNraW5nIHRoZSBsYXRlc3QgcHJpY2Ugb2YgeW91ciBmYXZvdXJpdGUgc3RvY2tzIHVzaW5nIGZpbmFuY2UueWFob28uY29tIEFQSSIsCiAgIm5hbWUiOiAiU3RvbmtzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tLzB4NDFuZHJlYS9nbm9tZS1zaGVsbC1zdG9ua3MiLAogICJ1dWlkIjogInN0b25rc0AweDQxbmRyZWEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "shortcutbutton@antoine-meloche.github.com", "name": "Shortcut Button", "pname": "shortcut-button", "description": "A Button to execute a command in your shell panel", "link": "https://extensions.gnome.org/extension/5636/shortcut-button/", "shell_version_map": {"42": {"version": "3", "sha256": "1ikvqpiznnmm3ykf84v6i9xj8dximnyyfa6ykmq7cdps0qa9fx1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQnV0dG9uIHRvIGV4ZWN1dGUgYSBjb21tYW5kIGluIHlvdXIgc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIlNob3J0Y3V0IEJ1dHRvbiIsCiAgInByZWZzX3NjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG9ydGN1dGJ1dHRvbi5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbnRvaW5lLU1lbG9jaGUvU2hvcnRjdXRCdXR0b24iLAogICJ1dWlkIjogInNob3J0Y3V0YnV0dG9uQGFudG9pbmUtbWVsb2NoZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "viewsplit@model-map.github.io", "name": "View Split", "pname": "view-split", "description": "Maximize your productivity with View Split, the window management tool that allows you to split windows into top, left, bottom, and right sections", "link": "https://extensions.gnome.org/extension/5651/view-split/", "shell_version_map": {"42": {"version": "2", "sha256": "1cikisv38s91qa399q2bvc4jdz0ysb016bh6paca4av2vkaig89i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byB0b3AsIGxlZnQsIGJvdHRvbSwgYW5kIHJpZ2h0IHNlY3Rpb25zIiwKICAibmFtZSI6ICJWaWV3IFNwbGl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "viewsplit@model-map.github.io", "name": "View Split", "pname": "view-split", "description": "Maximize your productivity with View Split, the window management tool that allows you to split windows into 2 or 4 sections.\n\nPrerequisite:\n- Disable (or change) keyboard shortcuts for Super+Left/Right/Up/Down in\nSettings -> Keyboard -> Keyboard shortcuts -> Windows", "link": "https://extensions.gnome.org/extension/5651/view-split/", "shell_version_map": {"42": {"version": "7", "sha256": "14hjfpispfpj461h0k7yqjq25vyc4469318kxddl9pwiqb26xa9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byAyIG9yIDQgc2VjdGlvbnMuXG5cblByZXJlcXVpc2l0ZTpcbi0gRGlzYWJsZSAob3IgY2hhbmdlKSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIFN1cGVyK0xlZnQvUmlnaHQvVXAvRG93biBpblxuU2V0dGluZ3MgLT4gS2V5Ym9hcmQgLT4gS2V5Ym9hcmQgc2hvcnRjdXRzIC0+IFdpbmRvd3MiLAogICJuYW1lIjogIlZpZXcgU3BsaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "14hjfpispfpj461h0k7yqjq25vyc4469318kxddl9pwiqb26xa9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byAyIG9yIDQgc2VjdGlvbnMuXG5cblByZXJlcXVpc2l0ZTpcbi0gRGlzYWJsZSAob3IgY2hhbmdlKSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIFN1cGVyK0xlZnQvUmlnaHQvVXAvRG93biBpblxuU2V0dGluZ3MgLT4gS2V5Ym9hcmQgLT4gS2V5Ym9hcmQgc2hvcnRjdXRzIC0+IFdpbmRvd3MiLAogICJuYW1lIjogIlZpZXcgU3BsaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "floating-panel-usedbymyself@wpism", "name": "Floating Panel-onlyusedbymyself", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5657/floating-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "weatherornot@somepaulo.github.io", "name": "Weather or Not", "pname": "weather-or-not", "description": "Display the current weather beside the clock (while also keeping it centered) and click the indicator to open GNOME Weather, which is required for this extension to function properly.\n\nThis is a fork of the Weather O'Clock extension.", "link": "https://extensions.gnome.org/extension/5660/weather-or-not/", "shell_version_map": {"42": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "cscotun0-ip-address@cjthedj97.github.com", "name": "cscotun0 IP Address", "pname": "cscotun0-ip-address", "description": "Show cscotun0 IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or other network interface IP addresses. Please install moreutils package as a dependency. Forked from https://github.com/AdamantisSpinae/gnome-extension-tun0-ip-address and modified tunnel interface it looks at.", "link": "https://extensions.gnome.org/extension/5663/cscotun0-ip-address/", "shell_version_map": {"40": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} @@ -891,6 +891,22 @@ , {"uuid": "azclock336@andreasplesch.gitlab.com", "name": "Desktop Clock Legacy", "pname": "desktop-clock-legacy", "description": "Add a clock to the desktop ! Please use dconf-editor to change settings.\nThis extension is a simple fork of the 'Desktop Clock' extension modified to work with Gnome Shell 3.36. This requires removal of the Settings dialog.", "link": "https://extensions.gnome.org/extension/5678/desktop-clock-legacy/", "shell_version_map": {"38": {"version": "2", "sha256": "03579g03wyp52fhf6rpszc91zqfw99afqvgf87nifb8bcf05mbyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJmNjk1Yjc4ZTgwMGQ0OTdlODUyYmVlZWU3YWJhNDRhMGU5ZWMzMDczIiwKICAiZGVzY3JpcHRpb24iOiAiQWRkIGEgY2xvY2sgdG8gdGhlIGRlc2t0b3AgISBQbGVhc2UgdXNlIGRjb25mLWVkaXRvciB0byBjaGFuZ2Ugc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIHNpbXBsZSBmb3JrIG9mIHRoZSAnRGVza3RvcCBDbG9jaycgZXh0ZW5zaW9uIG1vZGlmaWVkIHRvIHdvcmsgd2l0aCBHbm9tZSBTaGVsbCAzLjM2LiBUaGlzIHJlcXVpcmVzIHJlbW92YWwgb2YgdGhlIFNldHRpbmdzIGRpYWxvZy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhemNsb2NrIiwKICAibmFtZSI6ICJEZXNrdG9wIENsb2NrIExlZ2FjeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrMzM2IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYW5kcmVhc3BsZXNjaC9hemNsb2NrXzMuMzYiLAogICJ1dWlkIjogImF6Y2xvY2szMzZAYW5kcmVhc3BsZXNjaC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": {"43": {"version": "2", "sha256": "0sva4ilwxcsb59wgz1c82gjv50s28p468s65mdk1rb43icvhns9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": {"43": {"version": "3", "sha256": "1vax3zqhahaf1k7d4rgd9zwdziiib2zphkxm4ybd7xp034gs2kgx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3NtYW5rMy9vdHAta2V5cyIsCiAgInV1aWQiOiAib3RwLWtleXNAb3NtYW5rMy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "replace-activities-label@leleat-on-github", "name": "Replace Activities Label", "pname": "replace-activities-label", "description": "Remove the AppMenu, replace the activities label with 3 dots and animate them as a loading spinner.", "link": "https://extensions.gnome.org/extension/5706/replace-activities-label/", "shell_version_map": {"43": {"version": "1", "sha256": "1qcipdm0vzll5322si9hxirqlhar6ajs7vqbwcpq8h1n6s1ll55y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgQXBwTWVudSwgcmVwbGFjZSB0aGUgYWN0aXZpdGllcyBsYWJlbCB3aXRoIDMgZG90cyBhbmQgYW5pbWF0ZSB0aGVtIGFzIGEgbG9hZGluZyBzcGlubmVyLiIsCiAgIm5hbWUiOiAiUmVwbGFjZSBBY3Rpdml0aWVzIExhYmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlcGxhY2UtYWN0aXZpdGllcy1sYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvcmVwbGFjZS1hY3Rpdml0aWVzLWxhYmVsIiwKICAidXVpZCI6ICJyZXBsYWNlLWFjdGl2aXRpZXMtbGFiZWxAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {"43": {"version": "1", "sha256": "1n19dd1mjgdrggpkq9c25khfx8lyknf00y44fs7jxnpkixja8lwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "replace-activities-label@leleat-on-github", "name": "Replace Activities Label", "pname": "replace-activities-label", "description": "Remove the AppMenu, replace the activities label with 3 dots and animate them as a loading spinner.", "link": "https://extensions.gnome.org/extension/5706/replace-activities-label/", "shell_version_map": {"43": {"version": "4", "sha256": "0shpi61ymwgd0m9nc4jbl1ygjkdz563ip24pw531cv8b8jw8rqcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgQXBwTWVudSwgcmVwbGFjZSB0aGUgYWN0aXZpdGllcyBsYWJlbCB3aXRoIDMgZG90cyBhbmQgYW5pbWF0ZSB0aGVtIGFzIGEgbG9hZGluZyBzcGlubmVyLiIsCiAgIm5hbWUiOiAiUmVwbGFjZSBBY3Rpdml0aWVzIExhYmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlcGxhY2UtYWN0aXZpdGllcy1sYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvcmVwbGFjZS1hY3Rpdml0aWVzLWxhYmVsIiwKICAidXVpZCI6ICJyZXBsYWNlLWFjdGl2aXRpZXMtbGFiZWxAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {"43": {"version": "2", "sha256": "0wpcgr5mmh5h412an9l91xg2y0p679aa2civc3zygkvvw38zpm77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "downloads-indicator@Dieg0Js.github.io", "name": "Downloads Indicator", "pname": "downloads-indicator", "description": "A minimal Downloads manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5712/downloads-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "08rqx7hmf12ib2s2i6dlww9m2rhvivb7b3vwdldgv7wjn4ibsj9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBEb3dubG9hZHMgbWFuYWdlciBmb3IgdGhlIGdub21lIHNoZWxsLiBGb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJEb3dubG9hZHMgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJEaWVnMEpzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtZG93bmxvYWRzLWluZGljYXRvciIsCiAgInV1aWQiOiAiZG93bmxvYWRzLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "trash-indicator@Dieg0Js.github.io", "name": "Trash Indicator", "pname": "trash-indicator", "description": "A minimal Trash manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5715/trash-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "1lz8m11d1zbdkggm8zjnwi2fyalingy6nr4y2n2smxfpgfd2q9zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgR25vbWUgVHJhc2ggZnJvbSBBeGVsIHZvbiBCZXJ0b2xkaS4iLAogICJuYW1lIjogIlRyYXNoIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiRGllZzBKcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EaWVnMEpzL2dub21lLXRyYXNoLWluZGljYXRvciIsCiAgInV1aWQiOiAidHJhc2gtaW5kaWNhdG9yQERpZWcwSnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "battery-indicator-icon@Deminder", "name": "Battery Indicator Icon", "pname": "battery-indicator-icon", "description": "Replace the battery indicator icon with a circle or portrait.", "link": "https://extensions.gnome.org/extension/5718/battery-indicator-icon/", "shell_version_map": {"43": {"version": "4", "sha256": "0hrix756mghkzx31g6qaf263qgkh6ylfdfq0q0idz2rl9q66aa96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL2JhdHRlcnktaW5kaWNhdG9yLWljb24iLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yLWljb25ARGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell. Fork of Clipman by popov895.", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": {"42": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Battery Health Charging extension sets the limit of battery charging to maximize battery health mainly for Asus laptop. Since users usually keep their AC adapter connected while using their laptop, the battery is often in a state of high-power(98-100%) for extended length of time which causes a reduction in battery life.\nSimilar to the MyAsus app on Windows OS, you can set the limit to stop charging at one of the 3 following modes.\n\n1. Full Capacity Mode (100%): Battery is charged to its full capacity for longer use on battery power.\n\n2. Balanced Mode(80%): This mode is recommended when using the Notebook on battery power during meetings or conferences.\n\n3. Maximum Lifespan Mode(60%): This mode is recommended when the Notebook is always powered by AC adapter.\n\nFor more information about modes, compatibility, translation, bugs/issues visit:\nhttps://github.com/maniacx/Battery-Health-Charging", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": {"43": {"version": "3", "sha256": "0yf5v8g55rr0z6yab2qx2ra12skkaizig9a01g6rahbqvya98572", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIGV4dGVuc2lvbiBzZXRzIHRoZSBsaW1pdCBvZiBiYXR0ZXJ5IGNoYXJnaW5nIHRvIG1heGltaXplIGJhdHRlcnkgaGVhbHRoIG1haW5seSBmb3IgQXN1cyBsYXB0b3AuIFNpbmNlIHVzZXJzIHVzdWFsbHkga2VlcCB0aGVpciBBQyBhZGFwdGVyIGNvbm5lY3RlZCB3aGlsZSB1c2luZyB0aGVpciBsYXB0b3AsIHRoZSBiYXR0ZXJ5IGlzIG9mdGVuIGluIGEgc3RhdGUgb2YgIGhpZ2gtcG93ZXIoOTgtMTAwJSkgZm9yIGV4dGVuZGVkIGxlbmd0aCBvZiB0aW1lIHdoaWNoIGNhdXNlcyBhIHJlZHVjdGlvbiBpbiBiYXR0ZXJ5IGxpZmUuXG5TaW1pbGFyIHRvIHRoZSBNeUFzdXMgYXBwIG9uIFdpbmRvd3MgT1MsIHlvdSBjYW4gc2V0IHRoZSBsaW1pdCB0byBzdG9wIGNoYXJnaW5nIGF0IG9uZSBvZiB0aGUgMyBmb2xsb3dpbmcgbW9kZXMuXG5cbjEuIEZ1bGwgQ2FwYWNpdHkgTW9kZSAoMTAwJSk6IEJhdHRlcnkgaXMgY2hhcmdlZCB0byBpdHMgZnVsbCBjYXBhY2l0eSBmb3IgbG9uZ2VyIHVzZSBvbiBiYXR0ZXJ5IHBvd2VyLlxuXG4yLiBCYWxhbmNlZCBNb2RlKDgwJSk6IFRoaXMgbW9kZSBpcyByZWNvbW1lbmRlZCB3aGVuIHVzaW5nIHRoZSBOb3RlYm9vayBvbiBiYXR0ZXJ5IHBvd2VyIGR1cmluZyBtZWV0aW5ncyBvciBjb25mZXJlbmNlcy5cblxuMy4gTWF4aW11bSBMaWZlc3BhbiBNb2RlKDYwJSk6IFRoaXMgbW9kZSBpcyByZWNvbW1lbmRlZCB3aGVuIHRoZSBOb3RlYm9vayBpcyBhbHdheXMgcG93ZXJlZCBieSBBQyBhZGFwdGVyLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhYm91dCBtb2RlcywgY29tcGF0aWJpbGl0eSwgdHJhbnNsYXRpb24sIGJ1Z3MvaXNzdWVzIHZpc2l0OlxuaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {"43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "auto-brightness-toggle@sao.studio", "name": "Auto Brightness Toggle", "pname": "auto-brightness-toggle", "description": "Toggle auto brightness in quick settings", "link": "https://extensions.gnome.org/extension/5736/auto-brightness-toggle/", "shell_version_map": {"43": {"version": "2", "sha256": "143v91wf8ymcnmibg36m3zn08h2asmyks9s5gws7hlvmamfmlx33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhdXRvIGJyaWdodG5lc3MgaW4gcXVpY2sgc2V0dGluZ3MiLAogICJuYW1lIjogIkF1dG8gQnJpZ2h0bmVzcyBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvYXV0by1icmlnaHRuZXNzLXRvZ2dsZSIsCiAgInV1aWQiOiAiYXV0by1icmlnaHRuZXNzLXRvZ2dsZUBzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "Finans_Monitor@taylantatli_github", "name": "Finans Monitörü", "pname": "finans-monitoru", "description": "An Extension to track gold and foreign exchange prices in Turkey in real time with finans.truncgil.com API.", "link": "https://extensions.gnome.org/extension/5739/finans-monitoru/", "shell_version_map": {"43": {"version": "2", "sha256": "1mn38k1wqdp21l2x0aipjc9s4dx8gkkx693n2kshn2gxn0w4nair", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJBbiBFeHRlbnNpb24gdG8gdHJhY2sgZ29sZCBhbmQgZm9yZWlnbiBleGNoYW5nZSBwcmljZXMgaW4gVHVya2V5IGluIHJlYWwgdGltZSB3aXRoIGZpbmFucy50cnVuY2dpbC5jb20gQVBJLiIsCiAgIm5hbWUiOiAiRmluYW5zIE1vbml0XHUwMGY2clx1MDBmYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5maW5hbnMtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9UYXlsYW5UYXRsaS9maW5hbnNtb25pdG9ydSIsCiAgInV1aWQiOiAiRmluYW5zX01vbml0b3JAdGF5bGFudGF0bGlfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "volume-osd-always@alexandrecvieira.github.io", "name": "Volume OSD Always", "pname": "volume-osd-always", "description": "Show Volume OSD Always by scrolling over panel volume icon or changing volume slider.\n\nVersion 5: Added audio mute/unmute by middle-clicking the speaker icon on the menu bar", "link": "https://extensions.gnome.org/extension/5742/volume-osd-always/", "shell_version_map": {"42": {"version": "5", "sha256": "1svl2yk9mp39ackfc93bbx3fcafbmidr2ixm5g0wmkcpmgbpg2nx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVm9sdW1lIE9TRCBBbHdheXMgYnkgc2Nyb2xsaW5nIG92ZXIgcGFuZWwgdm9sdW1lIGljb24gb3IgY2hhbmdpbmcgdm9sdW1lIHNsaWRlci5cblxuVmVyc2lvbiA1OiBBZGRlZCBhdWRpbyBtdXRlL3VubXV0ZSBieSBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIiLAogICJuYW1lIjogIlZvbHVtZSBPU0QgQWx3YXlzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4YW5kcmVjdmllaXJhL3ZvbHVtZS1vc2QtYWx3YXlzIiwKICAidXVpZCI6ICJ2b2x1bWUtb3NkLWFsd2F5c0BhbGV4YW5kcmVjdmllaXJhLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "1svl2yk9mp39ackfc93bbx3fcafbmidr2ixm5g0wmkcpmgbpg2nx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVm9sdW1lIE9TRCBBbHdheXMgYnkgc2Nyb2xsaW5nIG92ZXIgcGFuZWwgdm9sdW1lIGljb24gb3IgY2hhbmdpbmcgdm9sdW1lIHNsaWRlci5cblxuVmVyc2lvbiA1OiBBZGRlZCBhdWRpbyBtdXRlL3VubXV0ZSBieSBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXIiLAogICJuYW1lIjogIlZvbHVtZSBPU0QgQWx3YXlzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4YW5kcmVjdmllaXJhL3ZvbHVtZS1vc2QtYWx3YXlzIiwKICAidXVpZCI6ICJ2b2x1bWUtb3NkLWFsd2F5c0BhbGV4YW5kcmVjdmllaXJhLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "pico-system-monitor@hiddewie", "name": "Pico System Monitor", "pname": "pico-system-monitor", "description": "Show current status on GNOME Shell panel\n\nbar shows CPU|memory|swap usages,then the download|upload speed and CPU temperature and fan speed\n\nDifferent colors represent different percentage states and CPU temperature\n\nplease use monospaced font for best experience", "link": "https://extensions.gnome.org/extension/5748/pico-system-monitor/", "shell_version_map": {"38": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "awake@vixalien.com", "name": "Keep Awake", "pname": "keep-awake", "description": "[DEPRECATED: Use \"Caffeine\" instead]. Disable the screensaver & auto suspend in quick settings", "link": "https://extensions.gnome.org/extension/5752/keep-awake/", "shell_version_map": {"43": {"version": "4", "sha256": "0rp8i954nlqnqgfl46xbl45pwib8v9zv6saa83kvcz4wzv3xvrdh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltERVBSRUNBVEVEOiBVc2UgXCJDYWZmZWluZVwiIGluc3RlYWRdLiBEaXNhYmxlIHRoZSBzY3JlZW5zYXZlciAmIGF1dG8gc3VzcGVuZCBpbiBxdWljayBzZXR0aW5ncyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hd2FrZSIsCiAgIm5hbWUiOiAiS2VlcCBBd2FrZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2FrZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92aXhhbGllbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXdha2UiLAogICJ1dWlkIjogImF3YWtlQHZpeGFsaWVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "brightness-control-percentage@minozzi60.gmail.com", "name": "Brightness Control Percentage", "pname": "brightness-control-percentage", "description": "Very useful to show your screen brightness value without having to open the menu", "link": "https://extensions.gnome.org/extension/5757/brightness-control-percentage/", "shell_version_map": {"42": {"version": "1", "sha256": "02w5caxi9dvxp4wdizxdiymaii5549f2rh9nwa7mb3psgw2a8sq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnkgdXNlZnVsIHRvIHNob3cgeW91ciBzY3JlZW4gYnJpZ2h0bmVzcyB2YWx1ZSB3aXRob3V0IGhhdmluZyB0byBvcGVuIHRoZSBtZW51IiwKICAibmFtZSI6ICJCcmlnaHRuZXNzIENvbnRyb2wgUGVyY2VudGFnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaW5venp6aS9icmlnaHRuZXNzLWNvbnRyb2wtcGVyY2VudGFnZSIsCiAgInV1aWQiOiAiYnJpZ2h0bmVzcy1jb250cm9sLXBlcmNlbnRhZ2VAbWlub3p6aTYwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "faustus-tuf@anas", "name": "Faustus Tuf Controls", "pname": "faustus-tuf-controls", "description": "This extension provides an easy and convenient way to change settings for your tuf laptop in the GNOME desktop environment based on the open source driver faustus for Tuf gaming laptops", "link": "https://extensions.gnome.org/extension/5760/faustus-tuf-controls/", "shell_version_map": {"40": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "wifiSwitcher@afzal.website", "name": "Wifi Switcher", "pname": "wifi-switcher", "description": "# Gnome-Wifi-Switcher\n\nThe purpose of this extension is to save time while switching wifi.\n\n# How To Use\n\nAll Wifi and newly added Networks are enabled by Default. You need to Disbale them by Right Clicking on \"Not Connected\" or Your Currently connected wifi name shown in main panel by the extension.\n\nLeft Click on the wifi to connect to next Wifi SSID, Simple.\n\nIssues: Currently on Ubuntu 20.04 clicking on switches some time does not work. So the Work around is minimize all other apps and then enable or disable wifis.\n\n# Thanks\nInspired by [SJBERTRAND](https://extensions.gnome.org//extension/5362/wireguard-vpn-extension/)\n\n# Pull Request\nWaiting for someone to fix PopupMenu which is currently shown on left side and on switching any switch closes automatically.", "link": "https://extensions.gnome.org/extension/5763/wifi-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "desaturated-tray-icons@cr1337.github.com", "name": "Desaturated Tray Icons", "pname": "desaturated-tray-icons", "description": "Display all tray icons in grayscale", "link": "https://extensions.gnome.org/extension/5766/desaturated-tray-icons/", "shell_version_map": {"42": {"version": "2", "sha256": "1v27biy9psxiv9fkgp83p9rqbwid2rqdwdc6f5rl4mnhj0fn8p8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYWxsIHRyYXkgaWNvbnMgaW4gZ3JheXNjYWxlIiwKICAibmFtZSI6ICJEZXNhdHVyYXRlZCBUcmF5IEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NSMTMzNy9kZXNhdHVyYXRlZC10cmF5LWljb25zIiwKICAidXVpZCI6ICJkZXNhdHVyYXRlZC10cmF5LWljb25zQGNyMTMzNy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "hassleless-overview-search@mechtifs", "name": "Hassleless Overview Search", "pname": "hassleless-overview-search", "description": "This extension reverts the ibus input source to default when entering the overview, and restores it after exiting, which solves the conflict between the ibus popup and the \"Type to search\" feature.", "link": "https://extensions.gnome.org/extension/5769/hassleless-overview-search/", "shell_version_map": {"42": {"version": "2", "sha256": "1k34mhmj9y9a2qikccakbv0cwx3qnw7a3a0yiqcf2b6781ml1kwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1k34mhmj9y9a2qikccakbv0cwx3qnw7a3a0yiqcf2b6781ml1kwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}}} ] diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 55239caf2bd1..727ae6358599 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glib @@ -29,6 +30,17 @@ mkDerivation rec { sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24="; }; + patches = [ + # FIXME: backport Plasma 5.27 build fix, remove for next release + (fetchpatch { + url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff"; + hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc="; + }) + ]; + + # FIXME: required to build with Plasma 5.27, which uses std::optional + cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 4d3c09a9f204..08755700b765 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/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/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index a5586648621f..d2ec15c09c6c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/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/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 7598ab5ed818..94a6e533dda3 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -15,6 +15,7 @@ , libgee , libhandy , gnome-settings-daemon +, mesa , mutter , elementary-icon-theme , wingpanel-with-indicators @@ -22,7 +23,6 @@ , nixos-artwork , lightdm , gdk-pixbuf -, clutter-gtk , dbus , accountsservice , wrapGAppsHook @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice - clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { libgee libhandy lightdm + mesa # for libEGL mutter ]; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 56428a9124ae..2a6c79666b3f 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -17,8 +17,8 @@ , bamf , libcanberra-gtk3 , gnome-desktop +, mesa , mutter -, clutter , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -119,7 +119,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf - clutter gnome-settings-daemon gexiv2 gnome-desktop @@ -127,6 +126,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + mesa # for libEGL mutter ]; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index dcc5c7f7cf3d..f8fc60a5409d 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -51,9 +51,9 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; + qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {}; - packages = self: with self; + packages = self: let propagate = out: @@ -98,6 +98,7 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ]; meta = let meta = args.meta or { }; in @@ -109,8 +110,8 @@ let broken = meta.broken or broken; }; in - mkDerivation (args // { - inherit pname version meta outputs setupHook src; + (args.stdenv or qtStdenv).mkDerivation (args // { + inherit pname version meta outputs setupHook src nativeBuildInputs; }); }; @@ -123,6 +124,7 @@ let breeze-grub = callPackage ./breeze-grub.nix { }; breeze-plymouth = callPackage ./breeze-plymouth { }; discover = callPackage ./discover.nix { }; + flatpak-kcm = callPackage ./flatpak-kcm.nix { }; kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; kde-cli-tools = callPackage ./kde-cli-tools.nix { }; kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; @@ -162,6 +164,7 @@ let plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome.nix { }; plasma-workspace = callPackage ./plasma-workspace { }; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { }; polkit-kde-agent = callPackage ./polkit-kde-agent.nix { }; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 2da4dc40e6be..0c77e43817c6 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/flatpak-kcm.nix b/pkgs/desktops/plasma-5/flatpak-kcm.nix new file mode 100644 index 000000000000..406a0c9c920c --- /dev/null +++ b/pkgs/desktops/plasma-5/flatpak-kcm.nix @@ -0,0 +1,18 @@ +{ mkDerivation +, extra-cmake-modules +, flatpak +, kcmutils +, kconfig +, kdeclarative +}: + +mkDerivation { + pname = "flatpak-kcm"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + flatpak + kcmutils + kconfig + kdeclarative + ]; +} diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix index 222e78558264..2f27dd201ce5 100644 --- a/pkgs/desktops/plasma-5/kinfocenter/default.nix +++ b/pkgs/desktops/plasma-5/kinfocenter/default.nix @@ -99,6 +99,6 @@ mkDerivation { # the same directory, while it is actually located in a completely different # store path preFixup = '' - ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter + ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter ''; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index d53d808e1084..f09104d534f9 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -7,6 +7,7 @@ , kdeclarative , kglobalaccel , kidletime +, libkscreen , kwayland , libXcursor , pam @@ -27,6 +28,7 @@ mkDerivation { kdeclarative kglobalaccel kidletime + libkscreen kwayland libXcursor pam diff --git a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch deleted file mode 100644 index ddaa7f76b13b..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001 -From: Yuriy Taraday -Date: Wed, 12 Oct 2022 12:07:23 +0400 -Subject: [PATCH] Revert "[x11] Refactor output updates" - -This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270. - -This should fix compilation with older GCC. ---- - CMakeLists.txt | 2 +- - .../standalone/x11_standalone_platform.cpp | 63 +++++++++++-------- - 2 files changed, 38 insertions(+), 27 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e7bf700e..6ff24aa5c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS) - add_definitions(-DEGL_NO_X11) - add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES) - --set(CMAKE_CXX_STANDARD 20) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - # required frameworks by Core -diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp -index 498d5cbe3..ac0f732b2 100644 ---- a/src/backends/x11/standalone/x11_standalone_platform.cpp -+++ b/src/backends/x11/standalone/x11_standalone_platform.cpp -@@ -54,8 +54,6 @@ - #include - #endif - --#include -- - namespace KWin - { - -@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen() - ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow()); - - if (!res.isNull()) { -- for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) { -+ for (int j = 0; j < res->num_crtcs; ++j) { -+ auto crtc = res.crtcs()[j]; - CrtcGamma gamma(crtc); - if (gamma.isNull()) { - continue; -@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs() - if (Xcb::Extensions::self()->isRandrAvailable()) { - T resources(rootWindow()); - if (!resources.isNull()) { -+ xcb_randr_crtc_t *crtcs = resources.crtcs(); -+ const xcb_randr_mode_info_t *modes = resources.modes(); -+ -+ QVector infos(resources->num_crtcs); -+ for (int i = 0; i < resources->num_crtcs; ++i) { -+ infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp); -+ } - -- std::span crtcs(resources.crtcs(), resources->num_crtcs); -- for (auto crtc : crtcs) { -- Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp); -+ for (int i = 0; i < resources->num_crtcs; ++i) { -+ Xcb::RandR::CrtcInfo info(infos.at(i)); - - const QRect geometry = info.rect(); - if (!geometry.isValid()) { - continue; - } - -- float refreshRate = -1.0f; -+ xcb_randr_output_t *outputs = info.outputs(); -+ QVector outputInfos(outputs ? resources->num_outputs : 0); -+ QVector edids(outputs ? resources->num_outputs : 0); -+ if (outputs) { -+ for (int i = 0; i < resources->num_outputs; ++i) { -+ outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp); -+ edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); -+ } -+ } - -- for (auto mode : std::span(resources.modes(), resources->num_modes)) { -- if (info->mode == mode.id) { -- if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996 -+ float refreshRate = -1.0f; -+ for (int j = 0; j < resources->num_modes; ++j) { -+ if (info->mode == modes[j].id) { -+ if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996 - // refresh rate calculation - WTF was wikipedia 1998 when I needed it? -- int dotclock = mode.dot_clock, -- vtotal = mode.vtotal; -- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { -+ int dotclock = modes[j].dot_clock, -+ vtotal = modes[j].vtotal; -+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { - dotclock *= 2; - } -- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { -+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { - vtotal *= 2; - } -- refreshRate = dotclock / float(mode.htotal * vtotal); -+ refreshRate = dotclock / float(modes[j].htotal * vtotal); - } - break; // found mode - } - } - -- for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) { -- Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp); -- if (outputInfo->crtc != crtc) { -+ for (int j = 0; j < info->num_outputs; ++j) { -+ Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j)); -+ if (outputInfo->crtc != crtcs[i]) { - continue; - } - -@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs() - // TODO: Perhaps the output has to save the inherited gamma ramp and - // restore it during tear down. Currently neither standalone x11 nor - // drm platform do this. -- Xcb::RandR::CrtcGamma gamma(crtc); -+ Xcb::RandR::CrtcGamma gamma(crtcs[i]); - - output->setRenderLoop(m_renderLoop.get()); -- output->setCrtc(crtc); -+ output->setCrtc(crtcs[i]); - output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size); -- auto it = std::find(crtcs.begin(), crtcs.end(), crtc); -- int crtcIndex = std::distance(crtcs.begin(), it); -- output->setXineramaNumber(crtcIndex); -+ output->setXineramaNumber(i); - - QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height); - switch (info->rotation) { -@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs() - .physicalSize = physicalSize, - }; - -- auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); - bool ok; -- if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) { -- if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) { -+ if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) { -+ if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) { - information.manufacturer = edid.manufacturerString(); - information.model = edid.monitorName(); - information.serialNumber = edid.serialNumber(); --- -2.37.2 - diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch index 50c7cef3f8cd..d0be721b044c 100644 --- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -13,9 +13,9 @@ index efd236b..a69c046 100644 --- a/src/plugins/qpa/main.cpp +++ b/src/plugins/qpa/main.cpp @@ -23,7 +23,7 @@ public: + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { - Q_UNUSED(paramList) - if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { + if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { // Not KWin diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 8f69c965ea07..6269dd4d0c2a 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -57,6 +57,7 @@ , plasma-framework , libqaccessibilityclient , python3 +, gcc12Stdenv }: # TODO (ttuegel): investigate qmlplugindump failure @@ -142,12 +143,15 @@ mkDerivation { url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) - ] ++ lib.optionals stdenv.isAarch64 [ - ./0001-Revert-x11-Refactor-output-updates.patch ]; + + stdenv = if stdenv.isAarch64 then gcc12Stdenv else stdenv; + CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' - ]; + ] + ++ lib.optional stdenv.isAarch64 "-mno-outline-atomics"; + postInstall = '' # Some package(s) refer to these service types by the wrong name. # I would prefer to patch those packages, but I cannot find them! diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch index 3d19f2d89fa1..948c045db4b1 100644 --- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch +++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch @@ -1,16 +1,20 @@ -Index: libkscreen-5.9.4/src/backendmanager.cpp -=================================================================== ---- libkscreen-5.9.4.orig/src/backendmanager.cpp -+++ libkscreen-5.9.4/src/backendmanager.cpp -@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) +diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp +index e1013d5..4bded53 100644 +--- a/src/backendmanager.cpp ++++ b/src/backendmanager.cpp +@@ -164,18 +164,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) + QFileInfoList BackendManager::listBackends() { - // Compile a list of installed backends first +- // Compile a list of installed backends first - const QString backendFilter = QStringLiteral("KSC_*"); - const QStringList paths = QCoreApplication::libraryPaths(); - QFileInfoList finfos; - for (const QString &path : paths) { -- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files); +- const QDir dir(path + QStringLiteral("/kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/kscreen/"), +- backendFilter, +- QDir::SortFlags(QDir::QDir::Name), +- QDir::NoDotAndDotDot | QDir::Files); - finfos.append(dir.entryInfoList()); - } - return finfos; @@ -21,4 +25,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp + return dir.entryInfoList(); } - KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments) + void BackendManager::setBackendArgs(const QVariantMap &arguments) diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix index 3f169244fdaf..be1c6ff42eff 100644 --- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -8,6 +8,7 @@ , kdeclarative , kcmutils , kpackage +, kscreenlocker , kwindowsystem , wayland , pkg-config @@ -29,6 +30,7 @@ mkDerivation { kdeclarative kcmutils kpackage + kscreenlocker kwindowsystem wayland libcec diff --git a/pkgs/desktops/plasma-5/plasma-welcome.nix b/pkgs/desktops/plasma-5/plasma-welcome.nix new file mode 100644 index 000000000000..1ae778b3282a --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-welcome.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, extra-cmake-modules +, qtquickcontrols2 +, accounts-qt +, kaccounts-integration +, kcoreaddons +, kconfigwidgets +, kdbusaddons +, kdeclarative +, ki18n +, kio +, kirigami2 +, knewstuff +, knotifications +, kservice +, kuserfeedback +, kwindowsystem +, plasma-framework +, signond +}: + +mkDerivation { + pname = "plasma-welcome"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtquickcontrols2 + accounts-qt + kaccounts-integration + kcoreaddons + kconfigwidgets + kdbusaddons + kdeclarative + ki18n + kio + kirigami2 + knewstuff + knotifications + kservice + kuserfeedback + kwindowsystem + plasma-framework + signond + ]; +} diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index cc0a02b6aabe..496223dc8423 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,467 +4,483 @@ { aura-browser = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/aura-browser-5.26.5.tar.xz"; - sha256 = "0dhj058vh577jyhcjdp6x9dmh6apxk6yinknfci8l6vss9gchini"; - name = "aura-browser-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/aura-browser-5.27.0.tar.xz"; + sha256 = "0lw7qvvgbyrqy7zb3m4bd0j4j36x26z0nzxm2g84kgddmczf95az"; + name = "aura-browser-5.27.0.tar.xz"; }; }; bluedevil = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/bluedevil-5.26.5.tar.xz"; - sha256 = "069hsn40zbnpkd73zcnnkdjv7n30dqyls5yvg3m0ljphn1syi79y"; - name = "bluedevil-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/bluedevil-5.27.0.tar.xz"; + sha256 = "0wjll668bmdk8xm2vl7p31md8ljwzycnr99y3bli4whczihiclly"; + name = "bluedevil-5.27.0.tar.xz"; }; }; breeze = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-5.26.5.tar.xz"; - sha256 = "00zzb03jan14byh19mga3jrzwi3rl084cgpnk0wj3gwgf903p78y"; - name = "breeze-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/breeze-5.27.0.tar.xz"; + sha256 = "0g68l0kfdsp9halrwpbn3azm3v97gdynpc4y1bwa6j2xxaj5fp4a"; + name = "breeze-5.27.0.tar.xz"; }; }; breeze-grub = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-grub-5.26.5.tar.xz"; - sha256 = "0ibjqv6hyqi4ljf5jhx5sv55li9jcvk5lydl0xrb54v8czbarg4w"; - name = "breeze-grub-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/breeze-grub-5.27.0.tar.xz"; + sha256 = "0mnga6fhpy10shvbfys6lw0q3hk61vhfa95ykvgv6d5ssavzamyp"; + name = "breeze-grub-5.27.0.tar.xz"; }; }; breeze-gtk = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-gtk-5.26.5.tar.xz"; - sha256 = "1k1kcrv6cbx9m0yxnqhdgwq0bd8qf8055acwjdphwjhl50icliqi"; - name = "breeze-gtk-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/breeze-gtk-5.27.0.tar.xz"; + sha256 = "1apd17b7p8i2i2ls6pdpabzijca4lwdzd4p1srx46wb0slm6fqma"; + name = "breeze-gtk-5.27.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-plymouth-5.26.5.tar.xz"; - sha256 = "0skiii7ni6r6jp3a7nq10hd6qdria1481lml4l57ma9afgvpxi9v"; - name = "breeze-plymouth-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/breeze-plymouth-5.27.0.tar.xz"; + sha256 = "103f8v56a8qm1hlnakbzljsv5iyfc3ynry169f2vvsafm40bc6c0"; + name = "breeze-plymouth-5.27.0.tar.xz"; }; }; discover = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/discover-5.26.5.tar.xz"; - sha256 = "19fd4f7nvqznfkrivxh77si627kqjnm1g17lidl9alz2iy2bxfm6"; - name = "discover-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/discover-5.27.0.tar.xz"; + sha256 = "0qa9hz7fxf1c9wi5c1x5z345mac3d5prgxxvadv4285c0sxvqidz"; + name = "discover-5.27.0.tar.xz"; }; }; drkonqi = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/drkonqi-5.26.5.tar.xz"; - sha256 = "1syl78sl7wzjdb53glln6laa017cawgz0c39p33bdwq3kpzckw07"; - name = "drkonqi-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/drkonqi-5.27.0.tar.xz"; + sha256 = "015ivarw48ymsz06jbd2rdqvdmcww93r2msrmmfh7jrzszqh3dlg"; + name = "drkonqi-5.27.0.tar.xz"; + }; + }; + flatpak-kcm = { + version = "5.27.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.27.0/flatpak-kcm-5.27.0.tar.xz"; + sha256 = "0318p0pm79kzk4l1rc239h7a7kvswz9vy3kylznn561fazkn3lss"; + name = "flatpak-kcm-5.27.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kactivitymanagerd-5.26.5.tar.xz"; - sha256 = "0ypnnh3lpcfw8ggi6nc8sr4hcsamx6s3ax869b6rhh392avcw2ha"; - name = "kactivitymanagerd-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kactivitymanagerd-5.27.0.tar.xz"; + sha256 = "02k8il4sgl63rdkn63hhpsc6pymc9a5p4jv452fiw0vpf2zbj3sn"; + name = "kactivitymanagerd-5.27.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kde-cli-tools-5.26.5.tar.xz"; - sha256 = "0djxqxdkih4svmggk6lk6p6n3sx3w4q9fsnx2dxfn5injwh0qrkr"; - name = "kde-cli-tools-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kde-cli-tools-5.27.0.tar.xz"; + sha256 = "1w5cxbxwfnv5wl04jwchr14c6fx0yf3s3x98d18h87bd0vx3w48m"; + name = "kde-cli-tools-5.27.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kde-gtk-config-5.26.5.tar.xz"; - sha256 = "10r4kgpd04hh05yriga2r5awwdb8v93jsx0qksdgj3661xy00x7n"; - name = "kde-gtk-config-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kde-gtk-config-5.27.0.tar.xz"; + sha256 = "1bhqxnpgpj69jrfkn0znbnwp7r73gl6qb9xzi1pjj8cqb5bn5skg"; + name = "kde-gtk-config-5.27.0.tar.xz"; }; }; kdecoration = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kdecoration-5.26.5.tar.xz"; - sha256 = "1dzpqzi25wxmilj92lqjmd6wid3nlkbvnnpcpp0ywd860q30zzd2"; - name = "kdecoration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kdecoration-5.27.0.tar.xz"; + sha256 = "04vw9kyvwq5jg8pw85b96c3ahm8213pf4a03dm49hv1fdzslvjaf"; + name = "kdecoration-5.27.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kdeplasma-addons-5.26.5.tar.xz"; - sha256 = "17vrdnigif4v38gbh04p8qs7wqp3y3nqll1m7xc4qfqbq1dydyjq"; - name = "kdeplasma-addons-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kdeplasma-addons-5.27.0.tar.xz"; + sha256 = "19nr13aipfds1y5zr0a05wb55s7pdzqmpidmm7w9aaxxa5rbg623"; + name = "kdeplasma-addons-5.27.0.tar.xz"; }; }; kgamma5 = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kgamma5-5.26.5.tar.xz"; - sha256 = "0v4rpm2asv31w1rqrhn25kbcdl1acahg10lmh6iwisxl1i3x8hd8"; - name = "kgamma5-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kgamma5-5.27.0.tar.xz"; + sha256 = "1dyfpwfadp2n83lcr3mak3n8h2cxgxs2hv35madah6zf78m5ldw5"; + name = "kgamma5-5.27.0.tar.xz"; }; }; khotkeys = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/khotkeys-5.26.5.tar.xz"; - sha256 = "0lkmh5n76kmrdxm4snkk1zz7d927qkl69ajd5qhz277whpz3slw8"; - name = "khotkeys-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/khotkeys-5.27.0.tar.xz"; + sha256 = "1xyy7511k6a1xlr63qq3qbk8wr1c12skmqzxliijv8q2b7b8dpiz"; + name = "khotkeys-5.27.0.tar.xz"; }; }; kinfocenter = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kinfocenter-5.26.5.tar.xz"; - sha256 = "0rka2fm7r2zikv3lcd1q39swgcp6fs5l4f5ldpgwpk9bps96cy4x"; - name = "kinfocenter-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kinfocenter-5.27.0.tar.xz"; + sha256 = "0k9h4m0jzxdyqyfn9pam0ssmhj6lng0l8mn23r7yw6mqi1i01yvl"; + name = "kinfocenter-5.27.0.tar.xz"; }; }; kmenuedit = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kmenuedit-5.26.5.tar.xz"; - sha256 = "17iyk77mb1lp9xjl92ffvv111b4m2qq98xznd1qafnah7ix1cg7p"; - name = "kmenuedit-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kmenuedit-5.27.0.tar.xz"; + sha256 = "1jb5pjy6flar0hxy9avnryxjmvh0ixyxr7xjbzbwjfx6zzf40i62"; + name = "kmenuedit-5.27.0.tar.xz"; }; }; kpipewire = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kpipewire-5.26.5.tar.xz"; - sha256 = "1yqymwq48mqv9zfw3idb0abizrfhr7f4d37ys9w7a9jixcm7rdrv"; - name = "kpipewire-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kpipewire-5.27.0.tar.xz"; + sha256 = "0mhpi16025bznxgp9lkg44rjxbm541yl39nj1rffpqh3bvhgw600"; + name = "kpipewire-5.27.0.tar.xz"; }; }; kscreen = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kscreen-5.26.5.tar.xz"; - sha256 = "0w8yrzpgr23s7sr3296lrm2zbm2j2174zv5az41i44l907iq9y1x"; - name = "kscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kscreen-5.27.0.tar.xz"; + sha256 = "043g0h2lk6k4xqfbma45m91wf93fm0v1vgf49ax6bqx9y3hvb1gw"; + name = "kscreen-5.27.0.tar.xz"; }; }; kscreenlocker = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kscreenlocker-5.26.5.tar.xz"; - sha256 = "0lwn3xbbk1578974m3nkk2x5h9fadrcizvh4q4528s5wgxja6w2g"; - name = "kscreenlocker-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kscreenlocker-5.27.0.tar.xz"; + sha256 = "0xvwlqh6knrj2l9asrkmv7fzwl5xbxm05pgimb9lk1bk67nr0xir"; + name = "kscreenlocker-5.27.0.tar.xz"; }; }; ksshaskpass = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/ksshaskpass-5.26.5.tar.xz"; - sha256 = "0k0jxbkav115i5nhazxyz3s3wg6gyfcsa1jilf3j3fr8vnh8qhx0"; - name = "ksshaskpass-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/ksshaskpass-5.27.0.tar.xz"; + sha256 = "1p55lf47vznvvprs2wn5c7ccq4iy6cxkqqdl9di02rzj9rf81zbs"; + name = "ksshaskpass-5.27.0.tar.xz"; }; }; ksystemstats = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/ksystemstats-5.26.5.tar.xz"; - sha256 = "18sa2w6vgbqmw8wrg5vqbraql04x9kb7mj9k35z4zs2n4abfrrbi"; - name = "ksystemstats-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/ksystemstats-5.27.0.tar.xz"; + sha256 = "1vax9cq33gxv2qaz908bsckrvdpffl975ayliz72f6d2mhsx9r5i"; + name = "ksystemstats-5.27.0.tar.xz"; }; }; kwallet-pam = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwallet-pam-5.26.5.tar.xz"; - sha256 = "1c5pzih8id0gld7qdf8ffxsbfgq9bsvpx37qyzr941b3vif7f9yx"; - name = "kwallet-pam-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kwallet-pam-5.27.0.tar.xz"; + sha256 = "0kwlinn6xcxqrib4xc200c9dmbq0gk0hmh6ahzd0nvgng6g6bvw7"; + name = "kwallet-pam-5.27.0.tar.xz"; }; }; kwayland-integration = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwayland-integration-5.26.5.tar.xz"; - sha256 = "0czq16lq210hq7a3wqg7pvdr9a8vm16z6yb82p0w6yqv15kk7alx"; - name = "kwayland-integration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kwayland-integration-5.27.0.tar.xz"; + sha256 = "0aml251n9amrjiyp6933iz245z3qr5lvpdyxsgnpzlvn652zyfqv"; + name = "kwayland-integration-5.27.0.tar.xz"; }; }; kwin = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwin-5.26.5.tar.xz"; - sha256 = "1n0v0553s9l8s6wgdz5bhrnvww20q49h92v3m4w216razj7q3q0k"; - name = "kwin-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kwin-5.27.0.tar.xz"; + sha256 = "1g1rma3ks6i10dvqksa61fi0w0g87gbb73jjzkz0jicbs5823w9c"; + name = "kwin-5.27.0.tar.xz"; }; }; kwrited = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwrited-5.26.5.tar.xz"; - sha256 = "14savlbywkx5107s0viprafs9pl389zhjk32iy4x5jmf9dk6vmm9"; - name = "kwrited-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/kwrited-5.27.0.tar.xz"; + sha256 = "15fxhk9dd0z9pfc99hsb9zqwish8wkbld8kgj8a1nzl5a2dnjnd3"; + name = "kwrited-5.27.0.tar.xz"; }; }; layer-shell-qt = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/layer-shell-qt-5.26.5.tar.xz"; - sha256 = "1k79dcyic2hkm92sd7aix03ywagr4rgsdf86a9zy06kafg92jra9"; - name = "layer-shell-qt-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/layer-shell-qt-5.27.0.tar.xz"; + sha256 = "1zs3p7fbw3yf24d2zy51pyjlxy9gxs8k78c481yck04sj8vlf3cw"; + name = "layer-shell-qt-5.27.0.tar.xz"; }; }; libkscreen = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/libkscreen-5.26.5.tar.xz"; - sha256 = "0vajgzjvpn909ds88jddsg7bman0rdphrm70b0k5ar7bcw0x54d5"; - name = "libkscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/libkscreen-5.27.0.tar.xz"; + sha256 = "16b2j8gfgf12nxwm8pij41yl6ffcjh7h31rw54j6mlx2q7i5lq2h"; + name = "libkscreen-5.27.0.tar.xz"; }; }; libksysguard = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/libksysguard-5.26.5.tar.xz"; - sha256 = "01a1wm6z191lzjqd5iws90jd3ld3r6r1qaw95bl65l9ar8p3gr8p"; - name = "libksysguard-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/libksysguard-5.27.0.tar.xz"; + sha256 = "01lsf52kfzp6h964s1aifg4wlf52hba56wf66cq3vi05ghckfbb5"; + name = "libksysguard-5.27.0.tar.xz"; }; }; milou = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/milou-5.26.5.tar.xz"; - sha256 = "1pmz4n41ysb0mhgykvc65r5as8fkd7wr4k57sk0a12wzsndy7zv8"; - name = "milou-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/milou-5.27.0.tar.xz"; + sha256 = "1zs5n37crpqzbycjb5x239fs65wv2ghkx5m87sq65713rs7lmpbx"; + name = "milou-5.27.0.tar.xz"; }; }; oxygen = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/oxygen-5.26.5.tar.xz"; - sha256 = "0wllhniaqpzvzji51a9871j1697kjwbz4xj8q9x1w89ip88pb6gq"; - name = "oxygen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/oxygen-5.27.0.tar.xz"; + sha256 = "0vld1m3ac5z2z4k6vp8v5kzib094baj5ndwqvf6ryhyp9v7in3r0"; + name = "oxygen-5.27.0.tar.xz"; }; }; oxygen-sounds = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/oxygen-sounds-5.26.5.tar.xz"; - sha256 = "1ws6bssn2r2m666kd6i0xnmzxb8x3z2pa6qk36xpbs1xjxdv5wny"; - name = "oxygen-sounds-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/oxygen-sounds-5.27.0.tar.xz"; + sha256 = "08brv177p3hlqvkf7chy1s5i45vnbjsjxiqxmac8grfh9dgsjyk6"; + name = "oxygen-sounds-5.27.0.tar.xz"; }; }; plank-player = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plank-player-5.26.5.tar.xz"; - sha256 = "18yw74mqcd0igps10m1sd41rlir2y8y78xkljxj5w2y4yvh97vbs"; - name = "plank-player-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plank-player-5.27.0.tar.xz"; + sha256 = "0ng97dcpfvm5klwnqzc47rv8lwxj0cmidx3igzjgkrl23k4rcxy2"; + name = "plank-player-5.27.0.tar.xz"; }; }; plasma-bigscreen = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-bigscreen-5.26.5.tar.xz"; - sha256 = "0893ngwdgq1l76gib4p9212lwp4i2gxvpnmxygndbmkz7nhjax75"; - name = "plasma-bigscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-bigscreen-5.27.0.tar.xz"; + sha256 = "0c2zldcsfqklwv3lsw9fb7q39vsaq5lzxad3wqrhsphz8c8v6yxg"; + name = "plasma-bigscreen-5.27.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-browser-integration-5.26.5.tar.xz"; - sha256 = "1bfzha5vd8hjij758b0g6ibyi4f8gmijz92fgn5is0p1hydm8y4l"; - name = "plasma-browser-integration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-browser-integration-5.27.0.tar.xz"; + sha256 = "014fn47khppa7ay5sxcz43g81igbx6lpv19whc7p4ik3cp3rzk7i"; + name = "plasma-browser-integration-5.27.0.tar.xz"; }; }; plasma-desktop = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-desktop-5.26.5.tar.xz"; - sha256 = "15kc5sam3y2c1ccp14cs7v5zakgzz9gpxpyxapimlvkwscxmvzn6"; - name = "plasma-desktop-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-desktop-5.27.0.tar.xz"; + sha256 = "0d52a4adjkyah6ab93153mp5af8338mipm9712i9xzylwf73100q"; + name = "plasma-desktop-5.27.0.tar.xz"; }; }; plasma-disks = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-disks-5.26.5.tar.xz"; - sha256 = "137k44lly2qv6vrmfi4g2xqc7y907ywwshp7mn07qmbps3a85h30"; - name = "plasma-disks-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-disks-5.27.0.tar.xz"; + sha256 = "1m7hh901p7h0ibj7pgsqhz6jkn07mnw7m1xgs6d43i1n7vnw9hlb"; + name = "plasma-disks-5.27.0.tar.xz"; }; }; plasma-firewall = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-firewall-5.26.5.tar.xz"; - sha256 = "18fp7iqnyjx2p44n8hjs7fss212ja3k2i5cryrnmwpf7r0q73l36"; - name = "plasma-firewall-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-firewall-5.27.0.tar.xz"; + sha256 = "02haqjiim2qk77074likhvmj07120p7cr9lsxjsmhfc4f69wwkh2"; + name = "plasma-firewall-5.27.0.tar.xz"; }; }; plasma-integration = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-integration-5.26.5.tar.xz"; - sha256 = "0ap7rzhqmm7ai9sc6w281f2kf81qgs2h2qpf5bvbc6wm3vn1lm1g"; - name = "plasma-integration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-integration-5.27.0.tar.xz"; + sha256 = "0ma6ig7gldl26pav4j1svcwxbpmgfq72q6nxzyysrgxzfyk93c1w"; + name = "plasma-integration-5.27.0.tar.xz"; }; }; plasma-mobile = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-mobile-5.26.5.tar.xz"; - sha256 = "06gha8mga9xqmmvzc9why9pfzzpy8czrqym3k3n23pa9hy2qqsvj"; - name = "plasma-mobile-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-mobile-5.27.0.tar.xz"; + sha256 = "14a68d6lxm3pfq8znzk0k0f4kq9wpgmmj0zqa5jfr1gapqyrdkmv"; + name = "plasma-mobile-5.27.0.tar.xz"; }; }; plasma-nano = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-nano-5.26.5.tar.xz"; - sha256 = "161sabckgl8gjxxsm0aklp33bf05iq2p84vh2v5y6bfpimsnamnj"; - name = "plasma-nano-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-nano-5.27.0.tar.xz"; + sha256 = "0sc8fdbbwwn3a1gip31dvwb5pfdl1zk08i795yp5gfjc04kckxs1"; + name = "plasma-nano-5.27.0.tar.xz"; }; }; plasma-nm = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-nm-5.26.5.tar.xz"; - sha256 = "1msi9lhkhpb29h6fwkxqmp9js70r8vrvzzf38hzkgxcbf3757k64"; - name = "plasma-nm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-nm-5.27.0.tar.xz"; + sha256 = "0p7vqw7nkwpy84lg5w5alkrkaisg56fwsrgvwb43mb54h5pfcd4f"; + name = "plasma-nm-5.27.0.tar.xz"; }; }; plasma-pa = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-pa-5.26.5.tar.xz"; - sha256 = "19i9ipajiz68silvprap9pykki6rhb7d2ways501bx8g4vfcb0h5"; - name = "plasma-pa-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-pa-5.27.0.tar.xz"; + sha256 = "0z3njcfr8y9y9025sdz28qvi9fc6vsndfb7zi1wacrrncjxg1wkl"; + name = "plasma-pa-5.27.0.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-remotecontrollers-5.26.5.tar.xz"; - sha256 = "1cam1jchp3nwqkqskln4qbpb4rixzwa0bwma89ysdgqy0pzpq2x0"; - name = "plasma-remotecontrollers-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-remotecontrollers-5.27.0.tar.xz"; + sha256 = "0q8wjr5qi97k4j5lm5wy35r78hf9cwa9sbj170xm5ni2rmdlsb14"; + name = "plasma-remotecontrollers-5.27.0.tar.xz"; }; }; plasma-sdk = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-sdk-5.26.5.tar.xz"; - sha256 = "0p20s2cp5vd1chj28wq88ixb625hisl134hnlllz6h70s5vzy79n"; - name = "plasma-sdk-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-sdk-5.27.0.tar.xz"; + sha256 = "0fqbpcw705yy0szbvvnf266bclv9l65v563kmcsryq31y7ji15iz"; + name = "plasma-sdk-5.27.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-systemmonitor-5.26.5.tar.xz"; - sha256 = "0xghszlm8h70p192qizv2kj7f02fnf3p3hg1p10ni7sqfaczrbq1"; - name = "plasma-systemmonitor-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-systemmonitor-5.27.0.tar.xz"; + sha256 = "139jyqvwykxc7pfrcrrsyks0jdg3ljw8hg7plqw5n2cd4slx6psx"; + name = "plasma-systemmonitor-5.27.0.tar.xz"; }; }; plasma-tests = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-tests-5.26.5.tar.xz"; - sha256 = "1h0cinrgjdp7rhl3v55c40a5agd93rqwx1xjqyj06vkjkbigx0fr"; - name = "plasma-tests-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-tests-5.27.0.tar.xz"; + sha256 = "1ncsjiwlx73kc6xzlz1da8xdppw8q1al9k8lm6zj1qvf4mnb62kr"; + name = "plasma-tests-5.27.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-thunderbolt-5.26.5.tar.xz"; - sha256 = "1lzj3m2k34m3fvcq3ykr5igaq0sbc4v87cncxvz6ln0p7cq0i6y5"; - name = "plasma-thunderbolt-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-thunderbolt-5.27.0.tar.xz"; + sha256 = "053xi6vjlavavxqcz5d0b78pnjmswqg0y5kq4r7pqkazj0829ca3"; + name = "plasma-thunderbolt-5.27.0.tar.xz"; }; }; plasma-vault = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-vault-5.26.5.tar.xz"; - sha256 = "104cs6prb8v5mccshz5brknfllyfbfnjzzpdrgk1xpzh5apwmhja"; - name = "plasma-vault-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-vault-5.27.0.tar.xz"; + sha256 = "0i5m9jyvpv5rfwms75pw65c4x315lwby0cg7pab3dz2xsy82g2p8"; + name = "plasma-vault-5.27.0.tar.xz"; + }; + }; + plasma-welcome = { + version = "5.27.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.27.0/plasma-welcome-5.27.0.tar.xz"; + sha256 = "00pr7bvx1accs1faw149r28qkkjdxmmib2a6m7asyn591pykzbyh"; + name = "plasma-welcome-5.27.0.tar.xz"; }; }; plasma-workspace = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-5.26.5.tar.xz"; - sha256 = "082jnlqgbp48bmyp1nbzg2d0p0pxkvra6xjv40kvh6k6rmpr5cjc"; - name = "plasma-workspace-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-workspace-5.27.0.tar.xz"; + sha256 = "0fq71fhqn0lx88a7n8rw9jrwkcm720s2c2l1ry9035kmvz94w901"; + name = "plasma-workspace-5.27.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-wallpapers-5.26.5.tar.xz"; - sha256 = "07gln5jl947qfpvrgiqa1fnw8lnnf4jg734ayybi927j059s3g8i"; - name = "plasma-workspace-wallpapers-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plasma-workspace-wallpapers-5.27.0.tar.xz"; + sha256 = "1pyz1gnbg2n907yi4wlj9gq495145ww50z66q8ykgmix1yxwmjnz"; + name = "plasma-workspace-wallpapers-5.27.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plymouth-kcm-5.26.5.tar.xz"; - sha256 = "1isxs6gxbab2ddl22c3992gmdgy3mi5yjb9inv32ajzs6r7snrj1"; - name = "plymouth-kcm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/plymouth-kcm-5.27.0.tar.xz"; + sha256 = "1cbwpqfxlm0vc2hjllqbsy929my1pmmbmb15ggj9m7gmxc59fbaf"; + name = "plymouth-kcm-5.27.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.26.5"; + version = "1-5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/polkit-kde-agent-1-5.26.5.tar.xz"; - sha256 = "19jrjx40m8g6hwq5k7ibbm0fmb803hxync2022gqbwzfrdb4493i"; - name = "polkit-kde-agent-1-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/polkit-kde-agent-1-5.27.0.tar.xz"; + sha256 = "0mihvr8w9rlqvsh2g19r3zrxp3shaiwlmjcx2w3lx4swiysnyps1"; + name = "polkit-kde-agent-1-5.27.0.tar.xz"; }; }; powerdevil = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/powerdevil-5.26.5.tar.xz"; - sha256 = "063bqwdnpskcwqzpgcmjwgs9vpkn1gnq2nnzj2sdzrlflfrdsfvp"; - name = "powerdevil-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/powerdevil-5.27.0.tar.xz"; + sha256 = "0gdp2zsx761zkl4r4pj799x6q5jw0yzsljgx5p9cmrl4pvxb89rg"; + name = "powerdevil-5.27.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/qqc2-breeze-style-5.26.5.tar.xz"; - sha256 = "1lhv4jlg15w8a88czq0fazaizjwva3yv8wv3scdnhhyfnbkch9mr"; - name = "qqc2-breeze-style-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/qqc2-breeze-style-5.27.0.tar.xz"; + sha256 = "14aw06dvpqjglm4y0230b3yy2fg3z427ff87f9xn8f96603c8447"; + name = "qqc2-breeze-style-5.27.0.tar.xz"; }; }; sddm-kcm = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/sddm-kcm-5.26.5.tar.xz"; - sha256 = "0cglb7dvwrkdpl5bgg91yfxrvqfpc2szj3qipcmd6ladsvbz8cxv"; - name = "sddm-kcm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/sddm-kcm-5.27.0.tar.xz"; + sha256 = "1kdb5jyv4lrx02bjyzyaakq4ip4z095sfcipgipgc0w2ayicf1np"; + name = "sddm-kcm-5.27.0.tar.xz"; }; }; systemsettings = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/systemsettings-5.26.5.tar.xz"; - sha256 = "1jb1d6933gq07vgg3kzqna91cpcv87p38wrk70g17iz7pszjb3ns"; - name = "systemsettings-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/systemsettings-5.27.0.tar.xz"; + sha256 = "0smsv1kr9c5d7ypi74hvp3hrckk41p62ddhvjvlxw44qvykby597"; + name = "systemsettings-5.27.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/xdg-desktop-portal-kde-5.26.5.tar.xz"; - sha256 = "1hznyl90d3xswnjs4qc6r5azw1z3pzkr7z507v696xhv41j8bzsj"; - name = "xdg-desktop-portal-kde-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.0/xdg-desktop-portal-kde-5.27.0.tar.xz"; + sha256 = "069fsw47v7p63m05rf2pxllxw7f4agclndvxccyrjyvsv12hrmbh"; + name = "xdg-desktop-portal-kde-5.27.0.tar.xz"; }; }; } diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index e26c90592252..b05be287a89d 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; - NIX_LDFLAGS = "-ldl -lm"; + NIX_LDFLAGS = "-lm"; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 9d7e18ce24ed..2d1fa623745a 100644 --- a/pkgs/development/beam-modules/fetch-hex.nix +++ b/pkgs/development/beam-modules/fetch-hex.nix @@ -19,9 +19,18 @@ stdenv.mkDerivation ({ }; unpackCmd = '' - tar -xf $curSrc contents.tar.gz + tar -xf $curSrc contents.tar.gz CHECKSUM metadata.config mkdir contents tar -C contents -xzf contents.tar.gz + mv metadata.config contents/hex_metadata.config + + # To make the extracted hex tarballs appear legitimate to mix, we need to + # make sure they contain not just the contents of contents.tar.gz but also + # a .hex file with some lock metadata. + # We use an old version of .hex file per hex's mix_task_test.exs since it + # is just plain-text instead of an encoded format. + # See: https://github.com/hexpm/hex/blob/main/test/hex/mix_task_test.exs#L410 + echo -n "${pkg},${version},$(cat CHECKSUM | tr '[:upper:]' '[:lower:]'),hexpm" > contents/.hex ''; installPhase = '' diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index ac6d5f3c8b92..6d047dbe1ca5 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (attrs // { installPhase = attrs.installPhase or '' runHook preInstall - mix deps.get --only ${mixEnv} + mix deps.get ''${MIX_ENV:+--only $MIX_ENV} find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} + cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out runHook postInstall diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 9c7e8e3d0ac4..639ca8122762 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/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/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix new file mode 100644 index 000000000000..7bf6a64eeb84 --- /dev/null +++ b/pkgs/development/compilers/circt/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, cmake +, coreutils +, python3 +, git +, fetchFromGitHub +, ninja +}: + +let + pythonEnv = python3.withPackages (ps: [ ps.psutil ]); +in +stdenv.mkDerivation rec { + pname = "circt"; + version = "1.30.0"; + src = fetchFromGitHub { + owner = "llvm"; + repo = "circt"; + rev = "firtool-${version}"; + sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8="; + 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 + # cannot use lib.optionalString as it creates an empty string, disabling all tests + LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; + + 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/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 2e6b0d3f68f1..67448f38f257 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dev86"; - version = "0.16.21"; + version = "unstable-2022-07-19"; - src = fetchurl { - url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz"; - sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3"; + src = fetchFromGitHub { + owner = "jbruchon"; + repo = "dev86"; + rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a"; + hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg="; }; - hardeningDisable = [ "format" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - makeFlags = [ "PREFIX=$(out)" ]; - - # Parallel builds are not supported due to build process structure: - # tools are built sequentially in submakefiles and are reusing the - # same targets as dependencies. Building dependencies in parallel - # from different submakes is not synchronized and fails: + # Parallel builds are not supported due to build process structure: tools are + # built sequentially in submakefiles and are reusing the same targets as + # dependencies. Building dependencies in parallel from different submakes is + # not synchronized and fails: # make[3]: Entering directory '/build/dev86-0.16.21/libc' # Unable to execute as86. enableParallelBuilding = false; meta = { - description = "Linux 8086 development environment"; - homepage = "https://github.com/lkundrak/dev86"; + homepage = "https://github.com/jbruchon/dev86"; + description = + "C compiler, assembler and linker environment for the production of 8086 executables"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index c1fb9abf77d7..3f8871df4f96 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -151,13 +151,6 @@ stdenv.mkDerivation rec { git ]; - # Workaround cc-wrapper's --sysroot= value for `staging-next`: it - # breaks library lookup via RUNPATH: - # ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) - # ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' - # TODO(trofi): remove the workaround once cc-wrapper is fixed. - NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; - buildInputs = [ curl tzdata diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index caff0ad023f8..668391b2645b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -10,17 +10,19 @@ stdenv.mkDerivation rec { version = "12.2.rel1"; platform = { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; sha256 = { - aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; - x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; - x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; + aarch64-darwin = "0j12n631bmbfvnfbmv4q7cfhmh4l7ka3vcjcvyw0vjqb4msyia91"; + aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; + x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; + x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -47,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 76374201f456..4df0872688be 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -24,7 +24,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt }: @@ -83,6 +83,67 @@ let majorVersion = "10"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc10.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -125,10 +186,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -146,8 +207,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -158,41 +219,12 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -200,42 +232,15 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -258,10 +263,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -275,24 +277,17 @@ stdenv.mkDerivation ({ inherit enableMultilib enableShared; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; + } // optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 1d3dff7c6f2a..4b91e0598304 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -82,13 +82,77 @@ let majorVersion = "11"; ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + + # openjdk build fails without this on -march=opteron; is upstream in gcc12 + ++ [ ./gcc-issue-103910.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc11.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -131,10 +195,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -152,8 +216,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -164,41 +228,12 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -206,42 +241,15 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -264,10 +272,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -281,22 +286,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch new file mode 100644 index 000000000000..c3edd960f097 --- /dev/null +++ b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch @@ -0,0 +1,41 @@ +From d243f4009d8071b734df16cd70f4c5d09a373769 Mon Sep 17 00:00:00 2001 +From: Andrew Pinski +Date: Wed, 5 Jan 2022 22:00:07 +0000 +Subject: [PATCH] Fix target/103910: missing GTY on x86_mfence causing PCH + usage to ICE + +With -O3 -march=opteron, a mfence builtin is added after the loop +to say the nontemporal stores are no longer needed. This all good +without precompiled headers as the function decl that is referneced +by x86_mfence is referenced in another variable but with precompiled +headers, x86_mfence is all messed up and the decl was GC'ed away. +This fixes the problem by marking x86_mfence as GTY to save/restore +during precompiled headers just like most other variables in +the header file. + +Committed as obvious after a bootstrap/test on x86_64-linux-gnu. + +gcc/ChangeLog: + + PR target/103910 + * config/i386/i386.h (x86_mfence): Mark with GTY. +--- + gcc/config/i386/i386.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index f027608eefa..3ac0f698ae2 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -486,7 +486,7 @@ extern unsigned char ix86_prefetch_sse; + + /* Fence to use after loop using storent. */ + +-extern tree x86_mfence; ++extern GTY(()) tree x86_mfence; + #define FENCE_FOLLOWING_MOVNT x86_mfence + + /* Once GDB has been enhanced to deal with functions without frame +-- +2.31.1 + diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 3fe6620987a3..cb3b0ba5ca2d 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -123,6 +123,68 @@ let majorVersion = "12"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc12.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libucontext + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -165,10 +227,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -187,7 +249,7 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else "") + )) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -198,43 +260,12 @@ 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 (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -242,42 +273,15 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -300,10 +304,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -317,22 +318,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 810706ed0f3d..7e6d4eb12239 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -111,6 +111,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc48.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -158,83 +234,24 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -272,10 +289,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -290,22 +304,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index e25af867e537..4ea63d7c12e1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -127,6 +127,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc49.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -178,83 +254,24 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -292,10 +309,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -309,22 +323,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 450b23310337..7e5e2c6b10b5 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -31,7 +31,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -115,6 +115,86 @@ let majorVersion = "6"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc6.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchFromGitHub + fetchpatch + fetchurl + flex + gettext + gmp + gnatboot + gnused + gtk2 + isl + langAda + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; in # We need all these X libraries when building AWT with GTK. @@ -166,10 +246,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -187,92 +267,32 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else ""); + )) + ); 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langJava langAda langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -310,10 +330,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -327,20 +344,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index a0465e8bdd60..75366c5b04dd 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -91,6 +91,63 @@ let majorVersion = "7"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc7.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -133,10 +190,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -154,8 +211,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -165,82 +222,30 @@ 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) - ; - - # 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; + inherit (callFile ../common/dependencies.nix { }) + 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"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + configureFlags = (callFile ../common/configure-flags.nix { }) + ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -265,10 +270,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -282,22 +284,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 03fb9fb1205c..e0b1a1e24ada 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -73,6 +73,63 @@ let majorVersion = "8"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc8.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -115,10 +172,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -136,8 +193,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -147,79 +204,26 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -242,10 +246,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -259,22 +260,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 317c77ea835f..bcfd1c7dd38a 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -84,6 +84,66 @@ let majorVersion = "9"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc9.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -126,10 +186,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -147,8 +207,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -158,82 +218,26 @@ 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 (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # 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; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - 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; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -256,10 +260,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -273,22 +274,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index dd5a8de76e2a..2d7a058fa015 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -203,17 +203,6 @@ preInstall() { ln -s lib "$out/${targetConfig}/lib32" ln -s lib "${!outputLib}/${targetConfig}/lib32" fi - - # cc-wrappers uses --sysroot=/nix/store/does/not/exist as a way to - # drop default sysheaders search path. Unfortunately that switches - # clang++ into searching libraries in gcc in cross-compiler paths: - # from ${!outputLib}/lib (native) - # to ${!outputLib}/${targetPlatformConfig}/lib - # We create the symlink to make both native and cross paths - # available even if the toolchain is not the cross-compiler. - if [ ! -e ${!outputLib}/${targetPlatformConfig} ] ; then - ln -s . ${!outputLib}/${targetPlatformConfig} - fi } diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 25e59148440a..78d13cb941e3 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -25,7 +25,6 @@ , langJit }: -assert cloog != null -> lib.versionOlder version "5"; assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] @@ -188,7 +187,7 @@ let # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" - ++ lib.optionals (cloog != null) [ + ++ lib.optionals (lib.versionOlder version "5" && cloog != null) [ "--with-cloog=${cloog}" "--disable-cloog-version-check" "--enable-cloog-backend=isl" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix new file mode 100644 index 000000000000..d3ae3e33c46c --- /dev/null +++ b/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 (lib.versionOlder version "5" && 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/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix new file mode 100644 index 000000000000..84c3dc189b1f --- /dev/null +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -0,0 +1,19 @@ +{ lib, version, }: + +with lib; { + homepage = "https://gcc.gnu.org/"; + license = licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}"; + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + platforms = platforms.unix; + maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members; + +} diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 10ee40f710c8..41461a26d425 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -122,6 +122,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -420,6 +421,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 94ad5a78a0a7..22552fa67fb2 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -137,6 +137,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -416,6 +417,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 57e0db560a98..79b006ce5537 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -94,6 +94,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; aarch64-darwin = { variantSuffix = ""; @@ -107,6 +108,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; }; # Binary distributions for the musl libc for the respective system. @@ -118,6 +120,7 @@ let sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481"; }; isStatic = true; + isHadrian = true; # We can't check the RPATH for statically linked executable exePathForLibraryCheck = null; archSpecificLibraries = [ @@ -400,6 +403,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/development/compilers/gnu-cim/default.nix new file mode 100644 index 000000000000..b1cb9f08597e --- /dev/null +++ b/pkgs/development/compilers/gnu-cim/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "gnu-cim"; + version = "5.1"; + + outputs = ["out" "lib" "man" "info"]; + + src = fetchurl { + url = "mirror://gnu/cim/cim-${version}.tar.gz"; + hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; + }; + + postPatch = '' + for fname in lib/{simulation,simset}.c; do + substituteInPlace "$fname" \ + --replace \ + '#include "../../lib/cim.h"' \ + '#include "../lib/cim.h"' + done + ''; + + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + + doCheck = true; + + meta = with lib; { + description = "A GNU compiler for the programming language Simula"; + longDescription = '' + GNU Cim is a compiler for the programming language Simula. + It offers a class concept, separate compilation with full type checking, + interface to external C routines, an application package for process + simulation and a coroutine concept. Commonly used with the Demos for + discrete event modelling. + ''; + homepage = "https://www.gnu.org/software/cim/"; + license = licenses.gpl2; + platforms = platforms.all; + badPlatforms = [ "aarch64-darwin" ]; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 3c089f02920a..a6ecf62bbcb7 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , tzdata , substituteAll @@ -87,6 +88,12 @@ stdenv.mkDerivation rec { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.16.patch + + # runtime: support riscv64 SV57 mode + (fetchpatch { + url = "https://github.com/golang/go/commit/1e3c19f3fee12e5e2b7802a54908a4d4d03960da.patch"; + sha256 = "sha256-mk/9gXwQEcAkiRemF6GiNU0c0fhDR29/YcKgQR7ONTA="; + }) ]; GOOS = stdenv.targetPlatform.parsed.kernel.name; @@ -148,12 +155,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -173,6 +180,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 84a6059581e7..829772fa016e 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , tzdata , substituteAll @@ -87,6 +88,12 @@ stdenv.mkDerivation rec { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.16.patch + + # runtime: support riscv64 SV57 mode + (fetchpatch { + url = "https://github.com/golang/go/commit/1e3c19f3fee12e5e2b7802a54908a4d4d03960da.patch"; + sha256 = "sha256-mk/9gXwQEcAkiRemF6GiNU0c0fhDR29/YcKgQR7ONTA="; + }) ]; GOOS = stdenv.targetPlatform.parsed.kernel.name; @@ -148,12 +155,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -173,6 +180,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index a8c441813f17..f432e5468779 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20"; + version = "1.20.1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-Oin/BCG+r2MpKSuKRjEcn78GyAAHfO3e9ft/jVsazjM="; + hash = "sha256-tcGjr1LDhabRx2rtU2HPJkWQI5gNAyDedli645FYMaI="; }; strictDeps = true; @@ -147,12 +147,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -172,6 +172,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix new file mode 100644 index 000000000000..a3236c14a084 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -0,0 +1,175 @@ +{ lib +, stdenv +, alsa-lib +, autoPatchelfHook +, cairo +, cups +, darwin +, fontconfig +, glib +, gtk3 +, makeWrapper +, setJavaClassPath +, unzip +, xorg +, zlib + # extra params +, javaVersion +, meta ? { } +, products ? [ ] +, gtkSupport ? stdenv.isLinux +, ... +} @ args: + +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "alsa-lib" + "autoPatchelfHook" + "cairo" + "cups" + "darwin" + "fontconfig" + "glib" + "gtk3" + "makeWrapper" + "setJavaClassPath" + "unzip" + "xorg" + "zlib" + "javaVersion" + "meta" + "products" + "gtkSupport" + ]; + runtimeLibraryPath = lib.makeLibraryPath + ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); + mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); + concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); + + graalvmXXX-ce = stdenv.mkDerivation ({ + pname = "graalvm${javaVersion}-ce"; + + unpackPhase = '' + runHook preUnpack + + mkdir -p "$out" + + # The tarball on Linux has the following directory structure: + # + # graalvm-ce-java11-20.3.0/* + # + # while on Darwin it looks like this: + # + # graalvm-ce-java11-20.3.0/Contents/Home/* + # + # We therefor use --strip-components=1 vs 3 depending on the platform. + tar xf "$src" -C "$out" --strip-components=${ + if stdenv.isLinux then "1" else "3" + } + + # Sanity check + if [ ! -d "$out/bin" ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi + + runHook postUnpack + ''; + + postUnpack = '' + for product in ${toString products}; do + cp -Rv $product/* $out + done + ''; + + dontStrip = true; + + nativeBuildInputs = [ unzip makeWrapper ] + ++ lib.optional stdenv.isLinux autoPatchelfHook; + + propagatedBuildInputs = [ setJavaClassPath zlib ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ]; + + preInstall = concatProducts "preInstall"; + postInstall = '' + # jni.h expects jni_md.h to be in the header search path. + ln -sf $out/include/linux/*_md.h $out/include/ + + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook << EOF + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + '' + concatProducts "postInstall"; + + preFixup = lib.optionalString (stdenv.isLinux) '' + for bin in $(find "$out/bin" -executable -type f); do + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + done + '' + concatProducts "preFixup"; + postFixup = concatProducts "postFixup"; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + ${# broken in darwin + lib.optionalString stdenv.isLinux '' + echo "Testing Jshell" + echo '1 + 1' | $out/bin/jshell + ''} + + echo ${ + lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + '' + } > HelloWorld.java + $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' + + ${concatProducts "installCheckPhase"} + + runHook postInstallCheck + ''; + + passthru = { + inherit products; + home = graalvmXXX-ce; + updateScript = ./update.sh; + }; + + meta = with lib; ({ + homepage = "https://www.graalvm.org/"; + description = "High-Performance Polyglot VM"; + license = with licenses; [ upl gpl2Classpath bsd3 ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "java"; + maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; + } // meta); + } // extraArgs); +in +graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix new file mode 100644 index 000000000000..6037435d3aec --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, autoPatchelfHook +, graalvm-ce +, makeWrapper +, perl +, unzip +, zlib + # extra params +, product +, javaVersion +, extraBuildInputs ? [ ] +, extraNativeBuildInputs ? [ ] +, graalvmPhases ? { } +, meta ? { } +, passthru ? { } +, ... +} @ args: + +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "autoPatchelfHook" + "graalvm-ce" + "makeWrapper" + "perl" + "unzip" + "zlib" + "product" + "javaVersion" + "extraBuildInputs" + "extraNativeBuildInputs" + "graalvmPhases" + "meta" + "passthru" + ]; +in +stdenv.mkDerivation ({ + pname = "${product}-java${javaVersion}"; + + nativeBuildInputs = [ perl unzip makeWrapper ] + ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ extraNativeBuildInputs; + + buildInputs = [ + stdenv.cc.cc.lib # libstdc++.so.6 + zlib + ] ++ extraBuildInputs; + + unpackPhase = '' + runHook preUnpack + + unpack_jar() { + local jar="$1" + unzip -q -o "$jar" -d "$out" + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + symlink $2, "$ENV{out}/$1"; + }' "$out/META-INF/symlinks" + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' "$out/META-INF/permissions" + rm -rf "$out/META-INF" + } + + unpack_jar "$src" + + runHook postUnpack + ''; + + # Allow autoPatchelf to automatically fix lib references between products + fixupPhase = '' + runHook preFixup + + mkdir -p $out/lib + shopt -s globstar + ln -s $out/languages/**/lib/*.so $out/lib + + runHook postFixup + ''; + + dontInstall = true; + dontBuild = true; + dontStrip = true; + + passthru = { + inherit product javaVersion; + # build phases that are going to run during GraalVM derivation build, + # since they depend in having the fully setup GraalVM environment + # e.g.: graalvmPhases.installCheckPhase will run the checks only after + # GraalVM+products is build + # see buildGraalvm.nix file for the available phases + inherit graalvmPhases; + } // passthru; + + meta = with lib; ({ + inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; + description = "High-Performance Polyglot VM (Product: ${product})"; + } // meta); +} // extraArgs) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 17ecd5060ba2..a0d57b75faa2 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -1,75 +1,168 @@ -{ callPackage, Foundation }: -/* - Add new graal versions and products here and then see update.nix on how to - generate the sources. -*/ +{ lib +, stdenv +, callPackage +, fetchurl +}: let - mkGraal = opts: callPackage (import ./mkGraal.nix opts) { - inherit Foundation; + buildGraalvm = callPackage ./buildGraalvm.nix; + buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; + javaPlatform = { + "aarch64-linux" = "linux-aarch64"; + "x86_64-linux" = "linux-amd64"; + "aarch64-darwin" = "darwin-aarch64"; + "x86_64-darwin" = "darwin-amd64"; }; - - /* - Looks a bit ugly but makes version update in the update script using sed - much easier - - Don't change these values! They will be updated by the update script, see ./update.nix. - */ - graalvm11-ce-release-version = "22.3.0"; - graalvm17-ce-release-version = "22.3.0"; - - products = [ - "graalvm-ce" - "native-image-installable-svm" - ]; + javaPlatformVersion = javaVersion: + "${javaVersion}-${javaPlatform.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}")}"; + source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion} + or (throw "Unsupported product combination: product=${product} java=${javaVersion} system=${stdenv.system}"); in -{ - inherit mkGraal; +rec { + inherit buildGraalvm buildGraalvmProduct; - graalvm11-ce = mkGraal rec { - config = { - x86_64-darwin = { - inherit products; - arch = "darwin-amd64"; - }; - x86_64-linux = { - inherit products; - arch = "linux-amd64"; - }; - aarch64-darwin = { - inherit products; - arch = "darwin-aarch64"; - }; - aarch64-linux = { - inherit products; - arch = "linux-aarch64"; - }; - }; - defaultVersion = graalvm11-ce-release-version; + ### Java 11 ### + + # Mostly available for build purposes, not to be exposed at the top level + graalvm11-ce-bare = buildGraalvm rec { + version = "22.3.1"; javaVersion = "11"; + src = fetchurl (source "graalvm-ce" javaVersion); + meta.platforms = builtins.attrNames javaPlatform; + products = [ ]; }; - graalvm17-ce = mkGraal rec { - config = { - x86_64-darwin = { - inherit products; - arch = "darwin-amd64"; - }; - x86_64-linux = { - inherit products; - arch = "linux-amd64"; - }; - aarch64-darwin = { - inherit products; - arch = "darwin-aarch64"; - }; - aarch64-linux = { - inherit products; - arch = "linux-aarch64"; - }; - }; - defaultVersion = graalvm17-ce-release-version; + graalvm11-ce = graalvm11-ce-bare.override { + products = [ native-image-installable-svm-java11 ]; + }; + + # Mostly available for testing, not to be exposed at the top level + graalvm11-ce-full = graalvm11-ce-bare.override { + products = [ + js-installable-svm-java11 + llvm-installable-svm-java11 + native-image-installable-svm-java11 + nodejs-installable-svm-java11 + python-installable-svm-java11 + ruby-installable-svm-java11 + wasm-installable-svm-java11 + ]; + }; + + js-installable-svm-java11 = callPackage ./js-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + + llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "llvm-installable-svm" javaVersion); + }; + + native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "native-image-installable-svm" javaVersion); + }; + + nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "nodejs-installable-svm" javaVersion); + graalvm-ce = graalvm11-ce-bare; + }; + + python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + + ruby-installable-svm-java11 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java11; + }; + + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; + + ### Java 17 ### + + # Mostly available for build purposes, not to be exposed at the top level + graalvm17-ce-bare = buildGraalvm rec { + version = "22.3.1"; javaVersion = "17"; + src = fetchurl (source "graalvm-ce" javaVersion); + meta.platforms = builtins.attrNames javaPlatform; + products = [ ]; + }; + + graalvm17-ce = graalvm17-ce-bare.override { + products = [ native-image-installable-svm-java17 ]; + }; + + # Mostly available for testing, not to be exposed at the top level + graalvm17-ce-full = graalvm17-ce-bare.override { + products = [ + js-installable-svm-java17 + llvm-installable-svm-java17 + native-image-installable-svm-java17 + nodejs-installable-svm-java17 + python-installable-svm-java17 + ruby-installable-svm-java17 + wasm-installable-svm-java17 + ]; + }; + + js-installable-svm-java17 = callPackage ./js-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + + llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "llvm-installable-svm" javaVersion); + }; + + native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "native-image-installable-svm" javaVersion); + }; + + nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "nodejs-installable-svm" javaVersion); + graalvm-ce = graalvm17-ce-bare; + }; + + python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + + ruby-installable-svm-java17 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java17; + }; + + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json deleted file mode 100644 index c9145e9654f8..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "darwin-aarch64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "c9657e902c2ba674931c3cf233a38c4de3d5186ae5d70452f9df75ac0c4cacff", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "dd9f91a970c7270b3f7fe8e711ba1ae081d34ed433c75f2bb0459aaf19e0fbe7", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-aarch64-22.3.0.jar" - } - }, - "darwin-amd64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "b8b39d6a3e3a9ed6348c2776ff071fc64ca90f98999ee846e6ca7e5fdc746a8b", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "00fe13c42813f581955eb35370bb8409ba17c7fdc83971d000baf695be2a0cb5", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-amd64-22.3.0.jar" - } - }, - "linux-aarch64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "c6646149dad486a0b02c5fc10649786240f275efda65aa14a25d01d2f5bafe15", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "0886e214f03f8a44962ecab459a94afb5c6a0f20910cb128d9ff775f4a9e4162", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-aarch64-22.3.0.jar" - } - }, - "linux-amd64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "d4200bcc43e5ad4e6949c1b1edc1e59f63066e3a2280d5bd82d0c9b1d67c3f2c", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "17843f92dc9de74b161a63c52cc2a4597e5472cf3f6f6d71930fb655b35f9208", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-amd64-22.3.0.jar" - } - } -} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json deleted file mode 100644 index dc2da450b699..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "darwin-aarch64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "dfc0c8998b8d00fcca87ef1c866c6e4985fd20b0beba3021f9677f9b166dfaf8", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "b6e44cb03f560bb43db1fd0aa862af36ba1df6717765920d91c18519712adfe9", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-aarch64-22.3.0.jar" - } - }, - "darwin-amd64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "422cd6abecfb8b40238460c09c42c5a018cb92fab4165de9691be2e3c3d0e8d1", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "9ce13874e62877d3bbe3faa4a57fbbffc766fdc8191971e7b25de0226fe86598", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-amd64-22.3.0.jar" - } - }, - "linux-aarch64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "e27249d9eef4504deb005cf14c6a028aad1adfa37209e12e9d7407710c08ed90", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "d5b833c44d37fbe4df75906f73144e2db01e683bca3386fe185f4abbc8fbc798", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-aarch64-22.3.0.jar" - } - }, - "linux-amd64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "3473d8b3b1bc682e95adfb3ac1d9a59b51b0f43e2b752f2a5b550e4ebfa2fd17", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "d1f5c58b65c57ad8a0c7da0c4569ce815ebf1ae503b0741ba1facf27b816d398", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-amd64-22.3.0.jar" - } - } -} diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix new file mode 100644 index 000000000000..eb2f455abbe5 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -0,0 +1,267 @@ +# Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script +{ + "llvm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0h8xkvsixcwak5dymkj3jgjv11w3ivnd6d45v5pdbymd0m2ifia8"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "nodejs-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "wasm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "js-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1b8vnjjsa548c6j3dycxp57i9xmyvndiz2xhv7fm10izcplyspxq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "python-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "native-image-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0z9rbmci6yz7f7mqd3xzsxc5ih4hq72lyzqfchan7fr6mh38d6gw"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "graalvm-ce" = { + "11-linux-aarch64" = { + sha256 = "1g4a3z9993pq52j3jf25pbcq9rvl8jz1yar8c859jw5chaf3ysml"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-aarch64-22.3.1.tar.gz"; + }; + "17-linux-aarch64" = { + sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz"; + }; + "11-linux-amd64" = { + sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz"; + }; + "17-linux-amd64" = { + sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz"; + }; + "11-darwin-aarch64" = { + sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz"; + }; + "17-darwin-aarch64" = { + sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz"; + }; + "11-darwin-amd64" = { + sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz"; + }; + "17-darwin-amd64" = { + sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; + }; + }; + "ruby-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "10wm1sq7smywy63mzlsbn21kzd65yaqj8yismpq8bz19h9skas7w"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix new file mode 100644 index 000000000000..45cf50e90fee --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix @@ -0,0 +1,17 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "js-installable-svm"; + + graalvmPhases.installCheckPhase = '' + echo "Testing GraalJS" + echo '1 + 1' | $out/bin/js + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix new file mode 100644 index 000000000000..9fc8fb3db95e --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "llvm-installable-svm"; + + # TODO: improve this test + graalvmPhases.installCheckPhase = '' + echo "Testing llvm" + $out/bin/lli --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix deleted file mode 100644 index bd2d4413ec52..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ /dev/null @@ -1,335 +0,0 @@ -{ - # An attrset describing each platform configuration. All values are extract - # from the GraalVM releases available on - # https://github.com/graalvm/graalvm-ce-builds/releases - # Example: - # config = { - # x86_64-linux = { - # # List of products that will be included in the GraalVM derivation - # # See `with{NativeImage,Ruby,Python,WASM,*}Svm` variables for the - # # available values - # products = [ "graalvm-ce" "native-image-installable-svm" ]; - # # GraalVM arch, not to be confused with the nix platform - # arch = "linux-amd64"; - # # GraalVM version - # version = "22.0.0.2"; - # }; - # } - config - # GraalVM version that will be used unless overridden by `config..version` -, defaultVersion - # Java version used by GraalVM -, javaVersion - # Platforms were GraalVM will be allowed to build (i.e. `meta.platforms`) -, platforms ? builtins.attrNames config - # If set to true, update script will (re-)generate the sources file even if - # there are no updates available -, forceUpdate ? false - # 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 -, lib -, autoPatchelfHook -, fetchurl -, makeWrapper -, setJavaClassPath -, writeShellScriptBin - # minimum dependencies -, alsa-lib -, fontconfig -, Foundation -, freetype -, glibc -, openssl -, perl -, unzip -, xorg -, zlib - # runtime dependencies -, binutils -, cups -, gcc -, musl - # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux -, cairo -, glib - # updateScript deps -, gnused -, gtk3 -, jq -, writeShellScript -}: - -assert useMusl -> stdenv.isLinux; - -let - platform = config.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - version = platform.version or defaultVersion; - name = "graalvm${javaVersion}-ce"; - sources = builtins.fromJSON (builtins.readFile sourcesPath); - - runtimeLibraryPath = lib.makeLibraryPath - ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); - - runtimeDependencies = lib.makeBinPath ([ - binutils - stdenv.cc - ] ++ lib.optionals useMusl [ - (lib.getDev musl) - # GraalVM 21.3.0+ expects musl-gcc as -musl-gcc - (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'') - ]); - - withNativeImageSvm = builtins.elem "native-image-installable-svm" platform.products; - withRubySvm = builtins.elem "ruby-installable-svm" platform.products; - withPythonSvm = builtins.elem "python-installable-svm" platform.products; - withWasmSvm = builtins.elem "wasm-installable-svm" platform.products; - - graalvmXXX-ce = stdenv.mkDerivation rec { - inherit version; - pname = name; - - srcs = map fetchurl (builtins.attrValues sources.${platform.arch}); - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - freetype - stdenv.cc.cc.lib # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - zlib - ] ++ lib.optionals withRubySvm [ - openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so - ]; - - nativeBuildInputs = [ unzip perl makeWrapper ] - ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - - unpackPhase = '' - unpack_jar() { - jar=$1 - unzip -q -o $jar -d $out - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - system "ln -s $2 $ENV{out}/$1"; - }' $out/META-INF/symlinks - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' $out/META-INF/permissions - rm -rf $out/META-INF - } - - mkdir -p $out - arr=($srcs) - - # The tarball on Linux has the following directory structure: - # - # graalvm-ce-java11-20.3.0/* - # - # while on Darwin it looks like this: - # - # graalvm-ce-java11-20.3.0/Contents/Home/* - # - # We therefor use --strip-components=1 vs 3 depending on the platform. - tar xf ''${arr[0]} -C $out --strip-components=${ - if stdenv.isLinux then "1" else "3" - } - - # Sanity check - if [ ! -d $out/bin ]; then - echo "The `bin` is directory missing after extracting the graalvm" - echo "tarball, please compare the directory structure of the" - echo "tarball with what happens in the unpackPhase (in particular" - echo "with regards to the `--strip-components` flag)." - exit 1 - fi - - for jar in "''${arr[@]:1}"; do - unpack_jar "$jar" - done - ''; - - outputs = [ "out" "lib" ]; - - installPhase = '' - # ensure that $lib/lib exists to avoid breaking builds - mkdir -p "$lib/lib" - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook << EOF - 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 - '' - } - ''; - - dontStrip = true; - - # Workaround for libssl.so.10 wanted by TruffleRuby - # Resulting TruffleRuby cannot use `openssl` library. - autoPatchelfIgnoreMissingDeps = withRubySvm && stdenv.isDarwin; - - preFixup = lib.optionalString (stdenv.isLinux) '' - # Find all executables in any directory that contains '/bin/' - for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do - wrapProgram "$bin" \ - --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" \ - --prefix PATH : "${runtimeDependencies}" - done - - find "$out" -name libfontmanager.so -exec \ - patchelf --add-needed libfontconfig.so {} \; - - ${ - lib.optionalString withRubySvm '' - # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby - patchelf $out/languages/ruby/lib/mri/openssl.so \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - '' - } - ''; - - # $out/bin/native-image needs zlib to build native executables. - propagatedBuildInputs = [ setJavaClassPath zlib ] ++ - # On Darwin native-image calls clang and it - # tries to include , - # and Interactive Ruby (irb) requires OpenSSL - # headers. - lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; - - doInstallCheck = true; - installCheckPhase = '' - echo ${ - lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - '' - } > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler 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 - ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - '' - } - - ${# --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 - ./helloworld | fgrep 'Hello World' - '' - } - - ${ - lib.optionalString withWasmSvm '' - echo "Testing Jshell" - echo '1 + 1' | $out/bin/jshell - '' - } - - ${ - lib.optionalString withPythonSvm '' - echo "Testing GraalPython" - $out/bin/graalpython -c 'print(1 + 1)' - echo '1 + 1' | $out/bin/graalpython - '' - } - - ${ - lib.optionalString withRubySvm '' - echo "Testing TruffleRuby" - # Hide warnings about wrong locale - export LANG=C - export LC_ALL=C - $out/bin/ruby -e 'puts(1 + 1)' - '' - # FIXME: irb is broken in all platforms - + lib.optionalString false '' - echo '1 + 1' | $out/bin/irb - '' - } - ''; - - passthru = { - inherit (platform) products; - home = graalvmXXX-ce; - updateScript = import ./update.nix { - inherit config defaultVersion forceUpdate gnused jq lib name sourcesPath writeShellScript; - graalVersion = version; - javaVersion = "java${javaVersion}"; - }; - }; - - meta = with lib; { - inherit platforms; - homepage = "https://www.graalvm.org/"; - description = "High-Performance Polyglot VM"; - license = with licenses; [ upl gpl2Classpath bsd3 ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "java"; - maintainers = with maintainers; [ - bandresen - hlolli - glittershark - babariviere - ericdallo - thiagokokada - ]; - }; - }; -in -graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix new file mode 100644 index 000000000000..427c5ffef5b5 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, graalvmCEPackages +, gcc +, glibc +, javaVersion +, musl +, src +, version +, writeShellScriptBin +, zlib +, useMusl ? false +, extraCLibs ? [ ] +}: + +assert useMusl -> stdenv.isLinux; +let + cLibs = [ glibc zlib.static ] + ++ lib.optionals (!useMusl) [ glibc.static ] + ++ lib.optionals useMusl [ musl ] + ++ extraCLibs; + # GraalVM 21.3.0+ expects musl-gcc as -musl-gcc + musl-gcc = (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"''); + binPath = lib.makeBinPath ([ gcc ] ++ lib.optionals useMusl [ musl-gcc ]); +in +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "native-image-installable-svm"; + + graalvmPhases.postInstall = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${lib.concatStringsSep " " + (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} + ''; + + graalvmPhases.installCheckPhase = '' + echo "Ahead-Of-Time compilation" + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + ./helloworld | fgrep 'Hello World' + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' + 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 --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' + echo "Ahead-Of-Time compilation with --static and --libc=musl" + $out/bin/native-image --static HelloWorld --libc=musl + ./helloworld | fgrep 'Hello World' + ''} + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix new file mode 100644 index 000000000000..022ac0a44fe1 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, graalvmCEPackages +, graalvm-ce +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "nodejs-installable-svm"; + + extraNativeBuildInputs = [ graalvm-ce ]; + + # TODO: improve test + graalvmPhases.installCheckPhase = '' + echo "Testing NodeJS" + $out/bin/npx --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix new file mode 100644 index 000000000000..43d6e85ef560 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "python-installable-svm"; + + graalvmPhases.installCheckPhase = '' + echo "Testing GraalPython" + $out/bin/graalpy -c 'print(1 + 1)' + echo '1 + 1' | $out/bin/graalpy + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix new file mode 100644 index 000000000000..30d0739b4b1d --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, graalvmCEPackages +, llvm-installable-svm +, openssl +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "ruby-installable-svm"; + + extraBuildInputs = [ + llvm-installable-svm + openssl + ]; + + preFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/languages/ruby/lib/mri/openssl.so \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + ''; + + graalvmPhases.installCheckPhase = '' + echo "Testing TruffleRuby" + # Fixup/silence warnings about wrong locale + export LANG=C + export LC_ALL=C + $out/bin/ruby -e 'puts(1 + 1)' + ${# broken in darwin with sandbox enabled + lib.optionalString stdenv.isLinux '' + echo '1 + 1' | $out/bin/irb + ''} + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix deleted file mode 100644 index 8bb31c792dda..000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ /dev/null @@ -1,227 +0,0 @@ -{ config -, defaultVersion -, forceUpdate -, gnused -, graalVersion -, javaVersion -, jq -, lib -, name -, sourcesPath -, writeShellScript -}: - -/* - How to use: - run `nix-shell maintainers/scripts/update.nix --argstr package graalvmXX-ce` - to update the graalvmXX-ce-sources.json file. - E.g: nix-shell maintainers/scripts/update.nix --argstr package graalvm17-ce - - Basic idea: - If we know the platform, product, javaVersion and graalVersion - we can create the url. This leads to the following json structure: - { - "platform/arch1": { - "product1|javaVersion|graalVersion": { "sha256": "...", "url": "..."}, - "product2|javaVersion|graalVersion": { "sha256": "...", "url": "..."}, - ... - }, - "platform/arch2": { - ... - } - } -*/ - -let - separator = "|"; - - # isDev :: String -> Boolean - isDev = version: - lib.hasInfix "dev" version; - - # getLatestVersion :: String -> String - getLatestVersion = currentVersion: - let - dev = if isDev currentVersion then "dev-" else ""; - url = "https://api.github.com/repos/graalvm/graalvm-ce-${dev}builds/releases/latest"; - file = builtins.fetchurl url; - json = builtins.fromJSON (builtins.readFile file); - in - lib.removePrefix "vm-" json.tag_name; - - # getArchString :: String -> String - getArchString = nixArchString: - { - "aarch64-linux" = "linux-aarch64"; - "aarch64-darwin" = "darwin-aarch64"; - "x86_64-linux" = "linux-amd64"; - "x86_64-darwin" = "darwin-amd64"; - }.${nixArchString}; - - - # getProductSuffix :: String -> String - getProductSuffix = productName: - { - "graalvm-ce" = ".tar.gz"; - "native-image-installable-svm" = ".jar"; - "ruby-installable-svm" = ".jar"; - "wasm-installable-svm" = ".jar"; - "python-installable-svm" = ".jar"; - "js-installable-svm" = ".jar"; - }.${productName}; - - # getProductSuffix :: String -> String - getProductBaseUrl = productName: - { - "graalvm-ce" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; - "native-image-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; - "ruby-installable-svm" = "https://github.com/oracle/truffleruby/releases/download"; - "wasm-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; - "python-installable-svm" = "https://github.com/graalvm/graalpython/releases/download"; - "js-installable-svm" = "https://github.com/oracle/graaljs/releases/download"; - }.${productName}; - - # getDevUrl :: String - getDevUrl = { arch, graalVersion, product, javaVersion }: - let - baseUrl = https://github.com/graalvm/graalvm-ce-dev-builds/releases/download; - in - "${baseUrl}/${graalVersion}/${product}-${javaVersion}-${arch}-dev${getProductSuffix product}"; - - # getReleaseUrl :: AttrSet -> String - getReleaseUrl = { arch, graalVersion, product, javaVersion }: - let baseUrl = getProductBaseUrl product; - in - "${baseUrl}/vm-${graalVersion}/${product}-${javaVersion}-${arch}-${graalVersion}${getProductSuffix product}"; - - # getUrl :: AttrSet -> String - getUrl = args@{ arch, graalVersion, product, javaVersion }: - if isDev graalVersion - then getDevUrl args - else getReleaseUrl args; - - # computeSha256 :: String -> String - computeSha256 = url: - builtins.hashFile "sha256" (builtins.fetchurl url); - - # downloadSha256 :: String -> String - downloadSha256 = url: - let sha256Url = url + ".sha256"; - in - builtins.readFile (builtins.fetchurl sha256Url); - - # getSha256 :: String -> String -> String - getSha256 = graalVersion: url: - if isDev graalVersion - then computeSha256 url - else downloadSha256 url; - - # cartesianZipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c] - cartesianZipListsWith = f: fst: snd: - let - cartesianProduct = lib.cartesianProductOfSets { a = fst; b = snd; }; - fst' = builtins.catAttrs "a" cartesianProduct; - snd' = builtins.catAttrs "b" cartesianProduct; - in - lib.zipListsWith f fst' snd'; - - # zipListsToAttrs :: [a] -> [b] -> AttrSet - zipListsToAttrs = names: values: - lib.listToAttrs ( - lib.zipListsWith (name: value: { inherit name value; }) names values - ); - - # genProductJavaVersionGraalVersionAttrSet :: String -> AttrSet - genProductJavaVersionGraalVersionAttrSet = product_javaVersion_graalVersion: - let - attrNames = [ "product" "javaVersion" "graalVersion" ]; - attrValues = lib.splitString separator product_javaVersion_graalVersion; - in - zipListsToAttrs attrNames attrValues; - - # genUrlAndSha256 :: String -> String -> AttrSet - genUrlAndSha256 = arch: product_javaVersion_graalVersion: - let - productJavaVersionGraalVersion = - (genProductJavaVersionGraalVersionAttrSet product_javaVersion_graalVersion) - // { inherit arch; }; - url = getUrl productJavaVersionGraalVersion; - sha256 = getSha256 productJavaVersionGraalVersion.graalVersion url; - in - { - ${arch} = { - ${product_javaVersion_graalVersion} = { - inherit sha256 url; - }; - }; - }; - - # genArchProductVersionPairs :: String -> -> String -> AttrSet -> [AttrSet] - genArchProductVersionList = javaVersion: graalVersion: archProducts: - let - arch = archProducts.arch; - products = archProducts.products; - javaGraalVersion = javaVersion + separator + (getLatestVersion (archProducts.version or graalVersion)); - productJavaGraalVersionList = - cartesianZipListsWith (a: b: a + separator + b) - products [ javaGraalVersion ]; - in - cartesianZipListsWith (genUrlAndSha256) [ arch ] productJavaGraalVersionList; - - - # genSources :: String -> String -> AttrSet -> Path String - genSources = javaVersion: defaultVersion: config: - let - archProducts = builtins.attrValues config; - sourcesList = builtins.concatMap (genArchProductVersionList javaVersion defaultVersion) archProducts; - sourcesAttr = builtins.foldl' (lib.recursiveUpdate) { } sourcesList; - in - builtins.toFile "sources.json" (builtins.toJSON sourcesAttr); - - # isNew :: String -> String -> Boolean - isNew = newVersion: currentVersion: - { - "-1" = false; - "0" = false; - "1" = true; - }.${builtins.toString (builtins.compareVersions newVersion currentVersion)}; - - newVersion = getLatestVersion graalVersion; - sourcesJson = genSources javaVersion defaultVersion config; - sourcesJsonPath = lib.strings.escapeShellArg sourcesPath; - - # versionKeyInDefaultNix String -> String - versionKeyInDefaultNix = graalVersion: - if isDev graalVersion - then "${name}-dev-version" - else "${name}-release-version"; - - /* - updateScriptText :: String -> String -> String - Writes the json file and updates the version in default.nix using sed - because update-source-version does not work srcs. - */ - updateScriptText = newVersion: currentVersion: - - if (forceUpdate || (isNew newVersion currentVersion)) - then - let - versionKey = versionKeyInDefaultNix currentVersion; - in - '' - echo "New version found. Updating ${currentVersion} -> ${newVersion}". - export PATH="${lib.makeBinPath [ jq gnused ]}:$PATH" - jq . ${sourcesJson} > ${sourcesJsonPath} - sed -i 's|${versionKey} = "${currentVersion}";|${versionKey} = "${newVersion}";|' \ - ${lib.strings.escapeShellArg ./default.nix} - '' - else ''echo "No new version found. Skip updating."''; - -in -writeShellScript "update-graal.sh" '' - set -o errexit - set -o nounset - set -o pipefail - - ${updateScriptText newVersion graalVersion} -'' diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh new file mode 100755 index 000000000000..6cafb0f0d118 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p coreutils curl.out nix jq gnused -i bash + +set -eou pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +tmpfile="$(mktemp --suffix=.nix)" + +trap 'rm -rf "$tmpfile"' EXIT + +info() { echo "[INFO] $*"; } + +echo_file() { echo "$@" >> "$tmpfile"; } + +verlte() { + [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ] +} + +readonly hashes_nix="hashes.nix" +readonly nixpkgs=../../../../.. + +readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version --json | jq -r)" + +if [[ -z "${1:-}" ]]; then + readonly gh_version="$(curl \ + ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | \ + jq --raw-output .tag_name)" + readonly new_version="${gh_version//vm-/}" +else + readonly new_version="$1" +fi + +info "Current version: $current_version" +info "New version: $new_version" +if verlte "$new_version" "$current_version"; then + info "graalvm-ce $current_version is up-to-date." + [[ -z "${FORCE:-}" ]] && exit 0 +else + info "graalvm-ce $current_version is out-of-date. Updating..." +fi + +declare -r -A products_urls=( + [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" + [js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar" + [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" + [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" + [nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar" + [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" + [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" + [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" +) + +readonly platforms=( + "11-linux-aarch64" + "17-linux-aarch64" + "11-linux-amd64" + "17-linux-amd64" + "11-darwin-aarch64" + "17-darwin-aarch64" + "11-darwin-amd64" + "17-darwin-amd64" +) + +info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..." + +# Indentation of `echo_file` function is on purpose to make it easier to visualize the output +echo_file "# Generated by $0 script" +echo_file "{" +for product in "${!products_urls[@]}"; do + url="${products_urls["${product}"]}" +echo_file " \"$product\" = {" + for platform in "${platforms[@]}"; do + args=("${url//@platform@/$platform}") + # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same + # e.g.: when adding a new product and running this script with FORCE=1 + if [[ "$current_version" == "$new_version" ]] && \ + previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then + args+=("$previous_hash" "--type" "sha256") + else + info "Hash in '$product' for '$platform' not found. Re-downloading it..." + fi + if hash="$(nix-prefetch-url "${args[@]}")"; then +echo_file " \"$platform\" = {" +echo_file " sha256 = \"$hash\";" +echo_file " url = \"${url//@platform@/${platform}}\";" +echo_file " };" + else + info "Error while downloading '$product' for '$platform'. Skipping it..." + fi + done +echo_file " };" +done +echo_file "}" + +info "Updating graalvm-ce version..." +# update-source-version does not work here since it expects src attribute +sed "s|$current_version|$new_version|" -i default.nix + +info "Moving the temporary file to hashes.nix" +mv "$tmpfile" "$hashes_nix" + +info "Done!" diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix new file mode 100644 index 000000000000..9a5bef7c1e35 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, graalvm-ce +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "wasm-installable-svm"; + + # TODO: improve this test + graalvmPhases.installCheckPhase = '' + echo "Testing wasm" + $out/bin/wasm --help + ''; + + # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release + meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; +} diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix index c04897fad1bb..121365320812 100644 --- a/pkgs/development/compilers/hare/default.nix +++ b/pkgs/development/compilers/hare/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: { - harec = callPackage ./harec { }; - hare = callPackage ./hare { }; + harec = pkgs.callPackage ./harec { }; + hare = pkgs.callPackage ./hare { }; }) diff --git a/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff similarity index 100% rename from pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch rename to pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff diff --git a/pkgs/development/compilers/hare/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk index 1d0783b118d3..b3b0f535915a 100644 --- a/pkgs/development/compilers/hare/hare/config-template.mk +++ b/pkgs/development/compilers/hare/hare/config-template.mk @@ -25,3 +25,20 @@ SCDOC = scdoc # Where to store build artifacts # set HARECACHE externally + +# Cross-compiler toolchains +# # TODO: fixup this +AARCH64_AS=aarch64-as +AARCH64_AR=aarch64-ar +AARCH64_CC=aarch64-cc +AARCH64_LD=aarch64-ld + +RISCV64_AS=riscv64-as +RISCV64_AR=riscv64-ar +RISCV64_CC=riscv64-cc +RISCV64_LD=riscv64-ld + +X86_64_AS=as +X86_64_AR=ar +X86_64_CC=cc +X86_64_LD=ld diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 2c6b8da6e342..c1d5e7800c95 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -2,25 +2,30 @@ , stdenv , fetchFromSourcehut , binutils-unwrapped -, harec +, harePackages , makeWrapper , qbe , scdoc , substituteAll }: -stdenv.mkDerivation (finalAttrs: { +let + inherit (harePackages) harec; +in +stdenv.mkDerivation (self: { pname = "hare"; - version = "unstable-2022-07-30"; + version = "unstable-2023-02-10"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare"; - rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9"; - hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc="; + rev = "52b3f2d0c7a85e04a79666a954101e527b7f1272"; + hash = "sha256-/zP8LbZ113Ar06MZF1zP20LKMGko+4HcOXSntLVAQAU="; }; - patches = [ ./disable-failing-test-cases.patch ]; + patches = [ + ./000-disable-failing-test-cases.diff + ]; nativeBuildInputs = [ binutils-unwrapped @@ -86,12 +91,13 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "A systems programming language designed to be simple, stable, and robust"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; + broken = stdenv.isAarch64; # still figuring how to set cross-compiling stuff }; }) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix index bdc9ef56b9d1..b29f53151ae4 100644 --- a/pkgs/development/compilers/hare/harec/default.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -4,15 +4,15 @@ , qbe }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "harec"; - version = "unstable-2022-07-02"; + version = "unstable-2023-02-08"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "harec"; - rev = "56359312644f76941de1878d33a1a0b840be8056"; - hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4="; + rev = "4730fa6b835f08c44bd7991cc8b264fbc27d752b"; + hash = "sha256-XOhZWdmkMAuXbj7svILJI3wI7RF9OAb/OE1uGel4/vE="; }; nativeBuildInputs = [ @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ - platforms = with platforms; + platforms = with lib.platforms; lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); - badPlatforms = with platforms; darwin; + badPlatforms = lib.platforms.darwin; }; }) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 610fffa03879..5aa423bbf84b 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -49,7 +49,7 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "hip-${hipPlatform}"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 5702ba2a2e6c..143feeb98e16 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -79,8 +79,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { installPhase = let buildType = if debugBuild then "fastdebug" else "release"; - debugSuffix = if debugBuild then "-fastdebug" else ""; - jcefSuffix = if debugBuild then "" else "_jcef"; + debugSuffix = lib.optionalString debugBuild "-fastdebug"; + jcefSuffix = lib.optionalString (!debugBuild) "_jcef"; in '' runHook preInstall diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 71bf442c82cd..d13b078494ad 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0-beta2"; + version = "1.9.0-beta4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM="; }; patches = [ @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao joshniemela ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index cb78eb5c6b34..a07e724cbd7a 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/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/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 9288fafa6f77..c7de19cd5b49 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/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/pkgs/development/compilers/llvm/10/bintools/default.nix b/pkgs/development/compilers/llvm/10/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index c1be5230e220..4a40a931af65 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 95eba5d7fb36..41c20ac47ebf 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/11/bintools/default.nix b/pkgs/development/compilers/llvm/11/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/11/lldb/default.nix b/pkgs/development/compilers/llvm/11/lldb/default.nix index 46d6c6628e10..5912323608dc 100644 --- a/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 2123efdf2351..93cf2757c652 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -203,7 +204,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/12/bintools/default.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index b6659034e813..c75eb255cd75 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index b04eeb3c7269..3d5592e19ee5 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index b6ee7b4dc25c..b69f4bd12917 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index d040e2b3975e..ca7a17a5e90d 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 32e96212fa57..e2d6da816f32 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -153,7 +154,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index b6ee7b4dc25c..b69f4bd12917 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix index 2493dcde0c84..cd28325a5573 100644 --- a/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch index f69ed9e162fb..f2a3b27296c1 100644 --- a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch +++ b/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/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 5437735f78fe..d8010ecf893d 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -6,6 +6,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -165,7 +166,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/15/bintools/default.nix b/pkgs/development/compilers/llvm/15/bintools/default.nix index 303faf7bbb61..c7b20dd28e23 100644 --- a/pkgs/development/compilers/llvm/15/bintools/default.nix +++ b/pkgs/development/compilers/llvm/15/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 722a5bd90cbd..3eb3903f1670 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals (useLLVM || bareMetal) [ diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index e0b79a9acfef..de98c4361531 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -9,6 +9,7 @@ , python3 , python3Packages , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -327,7 +328,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index a4d04f0618c7..31b88098c83a 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses @@ -168,10 +169,9 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - ++ lib.optional (!isDarwin) + ] ++ lib.optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ lib.optionals (isDarwin) [ + ] ++ lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index d18bf2149e1d..954887cd2368 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -4,6 +4,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses @@ -162,7 +163,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/7/bintools/default.nix b/pkgs/development/compilers/llvm/7/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index da72bb8b35ae..eaeef3c2ef50 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -180,7 +181,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/8/bintools/default.nix b/pkgs/development/compilers/llvm/8/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index 361221154298..4e8cdcdf8ac2 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 5c381a896e15..aa76fc0c3cf7 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -173,7 +174,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/9/bintools/default.nix b/pkgs/development/compilers/llvm/9/bintools/default.nix index 1eb7215c0085..38002439c205 100644 --- a/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index 57560ccbfe5b..49cc0a0d42a6 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/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/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index f8b6a8170f85..89bc014f5c65 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -188,7 +189,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 303faf7bbb61..3162b0d41e02 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -1,10 +1,7 @@ { runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index b4e2757f20ca..9a0d375df9c3 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -6,6 +6,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) , libbfd , libpfm , libxml2 @@ -151,7 +152,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 5a96242da7b1..da668b51e278 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation { runHook postConfigure ''; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-parameter" + "-Wno-error=use-after-free" + ]; + buildPhase = '' runHook preBuild cd src diff --git a/pkgs/development/compilers/ocaml/4.09.1-Werror.patch b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch new file mode 100644 index 000000000000..153c8a06e34e --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch @@ -0,0 +1,16 @@ +The 4.09.1 tarball appears to have been acidentally generated as a +development tarball, which causes configure to enable -Werror. This +means newer compilers will make the build fail. + +diff a/configure b/configure +--- a/configure ++++ b/configure +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index c5f649c15d6b..2d0672093905 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -8,6 +8,7 @@ import ./generic.nix { hardeningDisable = [ "strictoverflow" ]; patches = [ + ./4.09.1-Werror.patch # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch"; sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; } diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 798cdb790b87..08406a277353 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.5"; + version = "1.2.3.6"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY="; + sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 159dec05e293..76d1ebdb4102 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { pname = "picat"; - version = "3.0p4"; + version = "3.3p3"; src = fetchurl { - url = "http://picat-lang.org/download/picat30_4_src.tar.gz"; - sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj"; + url = "http://picat-lang.org/download/picat333_src.tar.gz"; + hash = "sha256-LMmAHCGKgon/wNbrXTUH9hiHyGVwwSDpB1236xawzXs="; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index c9464813d3f2..ee075ec04056 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "1.0"; + version = "1.1"; src = fetchzip { url = "https://c9x.me/compile/release/qbe-${version}.tar.xz"; - sha256 = "sha256-Or6m/y5hb9SlSToBevjhaSbk5Lo5BasbqeJmKd1QpGM="; + sha256 = "sha256-yFZ3cpp7eLjf7ythKFTY1YEJYyfeg2en4/D8+9oM1B4="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/rust/1_66.nix b/pkgs/development/compilers/rust/1_66.nix deleted file mode 100644 index 6aee98bdba06..000000000000 --- a/pkgs/development/compilers/rust/1_66.nix +++ /dev/null @@ -1,64 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob//.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost -, makeRustPlatform -, llvmPackages_11 -, llvmPackages_14, llvm_14 -} @ args: - -import ./default.nix { - rustcVersion = "1.66.1"; - rustcSha256 = "sha256-WzyTOpTHIYdwXU7ikxmLq/3QlEL1k3+9aF2zqB9JWbo="; - - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; - - llvmBootstrapForDarwin = llvmPackages_11; - - # For use at runtime - llvmShared = llvm_14.override { enableSharedLibraries = true; }; - - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_14; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.65.0"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - i686-unknown-linux-gnu = "b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46"; - x86_64-unknown-linux-gnu = "8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9"; - x86_64-unknown-linux-musl = "716984def5509a844c2dde1c7be42bfadeb179f751d5c1a30c9c7198c8c089cd"; - arm-unknown-linux-gnueabihf = "e27f835c16bfcb66ad022a17d5c4602899e021e483a432ca4cc2cb4ecd39e938"; - armv7-unknown-linux-gnueabihf = "5376d467a29b32cacb771e0c76dc280bd623852709e7ffd92caabab076d5475f"; - aarch64-unknown-linux-gnu = "f406136010e6a1cdce3fb6573506f00d23858af49dd20a46723c3fa5257b7796"; - aarch64-unknown-linux-musl = "4b701dc3cbac04ebf0e336cff2f4ce5fc1a1984c183226863c9ed911eb00b07e"; - x86_64-apple-darwin = "139087a3937799415fd829e5a88162a69a32c23725a44457f9c96b98e4d64a7c"; - aarch64-apple-darwin = "7ddc335bd10fc32d3039ef36248a5d0c4865db2437c8aad20a2428a6cf41df09"; - powerpc64le-unknown-linux-gnu = "3f1d0d5bb13213348dc65e373f8c412fc0a12ee55abc1c864f7e0300932fc687"; - riscv64gc-unknown-linux-gnu = "aac7067348d218faa452b4bdc735778a51570a310ad645313ec767b5d7c88492"; - mips64el-unknown-linux-gnuabi64 = "d91ed3857c5256720da890f6533684b684e880bf9006dc4e4f4181213a5c4a09"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_66; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_14" "llvm_14"]) diff --git a/pkgs/development/compilers/rust/1_67.nix b/pkgs/development/compilers/rust/1_67.nix new file mode 100644 index 000000000000..a0a43f31386d --- /dev/null +++ b/pkgs/development/compilers/rust/1_67.nix @@ -0,0 +1,81 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob//.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security, SystemConfiguration +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost +, makeRustPlatform +, llvmPackages_11 +, llvmPackages_15, llvm_15 +, fetchpatch +} @ args: + +import ./default.nix { + rustcVersion = "1.67.0"; + rustcSha256 = "sha256-0CnxT85Foux6mmBdKgpAquRznLL9rinun3pukCWn/eQ="; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + + llvmBootstrapForDarwin = llvmPackages_11; + + # For use at runtime + llvmShared = llvm_15.override { enableSharedLibraries = true; }; + + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackages = llvmPackages_15; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.66.1"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "823128f64e902ee8aff61488c552c983e17ccca10c3f46dd93fde924d5100eb3"; + x86_64-unknown-linux-gnu = "7ecf79e9ea23d05917b0172f9f81fb1e47011d261a719998f8d5620a1e835023"; + x86_64-unknown-linux-musl = "70b660148238b8a137c6f165b0bc7bdcb50204c22a314bed6174ecd672f02e57"; + arm-unknown-linux-gnueabihf = "12c93efe71f3334ef6e718786f6a60b9566f097d23a7f1e8f38ed9add209126f"; + armv7-unknown-linux-gnueabihf = "f43c8cd3fd7d1c1e08bd6317220b2ec9b25891f464604f80bb17985b09bbf62a"; + aarch64-unknown-linux-gnu = "84b8a79803c1b91386460fe6a7d04c54002344452ff8e5c5631d5fa275ed0c9c"; + aarch64-unknown-linux-musl = "b2665da33efd328cff192a67ad026ea84f9deab8d1971892f4bbc22647606163"; + x86_64-apple-darwin = "0fcf341db2579aa6eb61a3430cd1dbc79b042dfe89686b93cc887d818d086c30"; + aarch64-apple-darwin = "03469fcaa0d8c505e6db03c18ded73cfbb6a2ce159292f8cf06c042bfc9f7cf9"; + powerpc64le-unknown-linux-gnu = "ccf915a0137bb83a9d9b133a234ae53cc099f2ba26e3cb09d209b47bbee2ade7"; + riscv64gc-unknown-linux-gnu = "525cb05edaf3ed0560753b413c72dd1b06492df28bf3c427a66fda683fdca3fc"; + mips64el-unknown-linux-gnuabi64 = "3c241cc80410fe389e8b04beda62c42496c225fe8776db9d55a498c53244f7a6"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_67; + + rustcPatches = [ + # fix thin archive reading + # https://github.com/rust-lang/rust/pull/107360 + (fetchpatch { + name = "revert-back-to-llvmarchivebuilder-on-all-platforms.patch"; + url = "https://github.com/rust-lang/rust/commit/de363d54c40a378717881240e719f5f7223ba376.patch"; + hash = "sha256-3Xb803LZUZ1dldxGJ65Iw6gg1V1K827OB/0b32GqilU="; + }) + + # Fixes ICE. + # https://github.com/rust-lang/rust/pull/107688 + (fetchpatch { + name = "re-erased-regions-are-local.patch"; + url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch"; + excludes = [ "*tests/*" ]; + hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU="; + }) + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index d04eebe7eadf..481b4195891c 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, cacert, rustPlatform, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? false # TODO: change to true when this is the default }: @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { (lib.getDev pkgsHostHost.curl) zlib ]; - buildInputs = [ cacert file curl python3 openssl zlib ] + buildInputs = [ file curl python3 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that @@ -39,14 +39,7 @@ rustPlatform.buildRustPackage { RUSTC_BOOTSTRAP = 1; postInstall = '' - # NOTE: We override the `http.cainfo` option usually specified in - # `.cargo/config`. This is an issue when users want to specify - # their own certificate chain as environment variables take - # precedence - wrapProgram "$out/bin/cargo" \ - --suffix PATH : "${rustc}/bin" \ - --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ - --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" + wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" installManPage src/tools/cargo/src/etc/man/* diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 426f13778838..60f07a64299a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -165,7 +165,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - # TODO: remove libiconv once 1.66 is used to bootstrap ++ optionals stdenv.isDarwin [ libiconv Security ] ++ optional (!withBundledLLVM) llvmShared; diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index c9aa4a962ffa..f7bcd8e5b494 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) - } ${if stdenv.hostPlatform.system == "aarch64-darwin" then "--arch=arm64" else ""} + } ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"} (cd doc/manual ; make info) runHook postBuild diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 55bf5237e618..9a3e68a1b73b 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -96,7 +96,7 @@ let for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do patchShebangs "$i" done - TERM=xterm ./scripts/tests.sh ${if z3Support then "--no-smt" else ""} + TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} popd ''; diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix index a7d16cc2471a..0c7e0f8cbcf8 100644 --- a/pkgs/development/compilers/swift/wrapper/default.nix +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation (swift._wrapperParams // { swiftOs swiftArch swiftModuleSubdir swiftLibSubdir swiftStaticModuleSubdir swiftStaticLibSubdir; - swiftDriver = if useSwiftDriver - then "${swift-driver}/bin/swift-driver" else ""; + swiftDriver = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver"; passAsFile = [ "buildCommand" ]; buildCommand = '' diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 159b1827fc8f..ed1d7fc57a64 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { "-L${variables.libdir}" "-Wl,--rpath ${variables.libdir}" "-ltcc" - "-ldl" ]; variables = rec { prefix = "${placeholder "out"}"; diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index 2c8d6eb21aeb..cae9a17ccca4 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/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/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 67ebaa04699e..a881b2f1badb 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { -L${sqlite.out}/lib"; ''; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=use-after-free" + ]; + # Be sure to keep the statically linked libraries dontDisableStatic = true; diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 899006735873..1ff817a82969 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -15,11 +15,11 @@ src = fetchFromGitHub { owner = "chipsalliance"; repo = "yosys-f4pga-plugins"; - rev = "e23ff6db487da9ceea576c53ac33853566c3a84e"; - hash = "sha256-HJ4br6lQwRrcnkLgV3aecr3T3zcPzA11MfxhRjwIb0I="; + rev = "08430ec4f53d1cf9d6a2091211d6c5ce501d5486"; + hash = "sha256-xCFi8OrNfsKt7bVSYJ/yuBify/pyCU1rI16gaCBgil8="; }; - version = "2022.11.07"; + version = "2023.02.08"; # Supported symbiflow plugins. # @@ -79,13 +79,13 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { ]; buildFlags = [ - "PLUGINS_DIR=\${out}/share/yosys/plugins/" - "DATA_DIR=\${out}/share/yosys/" + "YOSYS_PLUGINS_DIR=\${out}/share/yosys/plugins/" + "YOSYS_DATA_DIR=\${out}/share/yosys/" ]; checkFlags = [ - "PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" - "DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" + "YOSYS_PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" + "YOSYS_DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" ( "NIX_YOSYS_PLUGIN_DIRS=\${NIX_BUILD_TOP}/source/${plugin}-plugin" # sdc and xdc plugins use design introspection for their tests + (lib.optionalString ( plugin == "sdc" || plugin == "xdc" ) diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index 89f23b9ca25d..966be329befc 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # ensure determinism in the compiler build + "-DZIG_TARGET_MCPU=baseline" ]; doCheck = true; diff --git a/pkgs/development/compilers/zig/0.9.1.nix b/pkgs/development/compilers/zig/0.9.1.nix index e7c62a4cf938..637186f686e9 100644 --- a/pkgs/development/compilers/zig/0.9.1.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # ensure determinism in the compiler build + "-DZIG_TARGET_MCPU=baseline" ]; doCheck = true; diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 3fbeaab38739..99f1f6e78407 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/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/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index c80f5f3dd573..5ffb9071534b 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , pkg-config , hidapi @@ -11,10 +10,10 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3"; + sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,15 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libftdi1 libusb1 ] ++ lib.optional stdenv.isLinux libgpiod; - patches = [ - # Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released. - (fetchpatch - { - url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch"; - sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q="; - }) - ]; - configureFlags = [ "--disable-werror" "--enable-jtag_vpi" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 548110cafc11..65feba3d079c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf"; + sha256 = "0f2nnszfiqwdgfky3190prkhcndp0mva3jk7a6cl461w8kp1jspa"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -138,6 +138,8 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; + pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli)); + # sse2 flag due to https://github.com/haskell/vector/issues/47. # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector); @@ -171,6 +173,9 @@ self: super: { # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; + # 2023-01-29: Restrictive base bound already loosened on master but not released: https://github.com/sebastiaanvisser/clay/commit/4483bdf7a452903f177220958f1610030ab7f28a + clay = throwIfNot (super.clay.version == "0.14.0") "Remove clay jailbreak in configuration-common.nix when you see this eval error." (doJailbreak super.clay); + # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; @@ -197,9 +202,15 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; + # 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27 + streamly-bytestring = dontCheck super.streamly-bytestring; + # base bound digit = doJailbreak super.digit; + # 2022-01-29: Tests require package to be in ghc-db. + aeson-schemas = dontCheck super.aeson-schemas; + # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0 matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { brick = self.brick_0_70_1; @@ -747,9 +758,9 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_8; + hspec = self.hspec_2_10_9; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_8; + hspec = self.hspec_2_10_9; }; }); @@ -920,12 +931,9 @@ self: super: { ''; }) super.hpack; - # hslua has tests that appear to break when using musl. + # hslua has tests that break when using musl. # https://github.com/hslua/hslua/issues/106 - # Note that hslua is currently version 1.3. However, in the latest version - # (>= 2.0), hslua has been split into multiple packages and this override - # will likely need to be moved to the hslua-core package. - hslua = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua else super.hslua; + hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core; # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate. prettyprinter = dontCheck super.prettyprinter; @@ -1139,7 +1147,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; @@ -1436,14 +1444,14 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override { - hspec-discover = self.hspec-discover_2_10_8; - hspec-core = self.hspec-core_2_10_8; + hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override { + hspec-discover = self.hspec-discover_2_10_9; + hspec-core = self.hspec-core_2_10_9; }); - hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { + hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_8 = super.hspec-core_2_10_8.override { + hspec-core_2_10_9 = super.hspec-core_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; @@ -2026,9 +2034,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # https://github.com/peti/hopenssl/issues/5 - hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; }; - # Fixes compilation with GHC 9.0 and above # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3 regex-compat-tdfa = appendPatches [ diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 2c40ee7711ee..2ea7f41ed79f 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -311,6 +311,8 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; + heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone; + } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index baa8752e1e8f..7604a1c507a2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/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/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ddd41bc57e72..92278ebb0e21 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/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/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 941f95c07fac..903b177efaff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/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/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 54994347dd93..8e3f63ec83d6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -61,6 +61,9 @@ self: super: { process = self.process_1_6_16_0; }); + # weeder == 2.5.* requires GHC 9.4 + weeder = doDistribute self.weeder_2_4_1; + # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 6278c728131f..30d117103c83 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -105,16 +105,16 @@ in { singleton-bool = doJailbreak super.singleton-bool; rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; shake-cabal = doDistribute self.shake-cabal_0_2_2_3; - + libmpd = doJailbreak super.libmpd; base-orphans = dontCheck super.base-orphans; # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_8; - hspec-core = self.hspec-core_2_10_8; + hspec = self.hspec_2_10_9; + hspec-core = self.hspec-core_2_10_9; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_8; + hspec-discover = self.hspec-discover_2_10_9; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 @@ -184,26 +184,34 @@ in { }) self.ghc-exactprint_1_6_1_1; - # 2022-10-06: plugins disabled for hls 1.8.0.0 based on + # 2023-02-01: plugins disabled for hls 1.9.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { - hls-refactor-plugin = null; hls-eval-plugin = null; - hls-floskell-plugin = null; - hls-ormolu-plugin = null; - hls-rename-plugin = null; + hls-ormolu-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-floskell-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-rename-plugin = null; # This plugin is supposed to work, but fails to compile. hls-stylish-haskell-plugin = null; }; # https://github.com/tweag/ormolu/issues/941 - ormolu = overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.ormolu); + ormolu = doDistribute self.ormolu_0_5_2_0; fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); - # The Haskell library has additional dependencies when compiled with ghc-9.4.x. - X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft; + # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455 + # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so + # the GHC 9.6 configuration may need similar overrides eventually. + X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; + # Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309 + glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib); + cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo); + pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango); + + # The gtk2hs setup hook provided by this package lacks the ppOrdering field that + # recent versions of Cabal require. This leads to builds like cairo and glib + # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. + gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e1ee3b669e66..570f58ec2faa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -86,7 +86,6 @@ broken-packages: - aeson-parsec-picky - aeson-prefix - aeson-schema - - aeson-schemas - aeson-smart - aeson-streams - aeson-t @@ -511,7 +510,6 @@ broken-packages: - byline - by-other-names - bytearray-parsing - - bytepatch - bytestring-aeson-orphans - bytestring-arbitrary - bytestring-class @@ -705,7 +703,6 @@ broken-packages: - classy-parallel - classyplate - ClassyPrelude - - clay - clckwrks-plugin-bugs - clckwrks-plugin-mailinglist - clckwrks-theme-clckwrks @@ -927,6 +924,7 @@ broken-packages: - credential-store - critbit - criterion-cmp + - criterion-compare - criterion-plus - criterion-to-html - criu-rpc-types @@ -1106,6 +1104,7 @@ broken-packages: - derive-monoid - derive-trie - deriving-openapi3 + - deriving-trans - derp-lib - describe - descriptive @@ -1437,6 +1436,7 @@ broken-packages: - extensible-effects-concurrent - extensible-skeleton - external-sort + - extism - extractelf - ez3 - ez-couch @@ -1446,7 +1446,6 @@ broken-packages: - fadno-braids - fadno-xml - failable-list - - FailT - failure-detector - fake - fake-type @@ -1822,7 +1821,6 @@ broken-packages: - gloss-banana - gloss-export - gloss-game - - glpk-headers - gltf-codec - glue - g-npm @@ -2485,7 +2483,6 @@ broken-packages: - hslogger-template - hs-logo - hslua-examples - - hslua-list - hsluv-haskell - hsmagick - hsmodetweaks @@ -2921,6 +2918,7 @@ broken-packages: - khph - kickass-torrents-dump-parser - kickchan + - kind-generics-deriving - kleene-list - kmn-programming - kmonad @@ -3068,6 +3066,7 @@ broken-packages: - libpafe - libpq - librandomorg + - libsecp256k1 - libsystemd-daemon - libtagc - libxls @@ -3248,7 +3247,6 @@ broken-packages: - math-grads - math-interpolate - math-metric - - math-programming - matrix-as-xyz - matrix-lens - matrix-market @@ -3359,6 +3357,8 @@ broken-packages: - ml-w - mm2 - mmsyn2 + - mmsyn7l + - mmsyn7ukr-array - mmtf - mmtl - Mobile-Legends-Hack-Cheats @@ -3807,10 +3807,12 @@ broken-packages: - pandoc-filter-indent - pandoc-include - pandoc-lens + - pandoc-lua-engine - pandoc-markdown-ghci-filter - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot + - pandoc-server - pandoc-unlit - pandoc-utils - pandora @@ -3956,7 +3958,13 @@ broken-packages: - phone-numbers - phone-push - phonetic-languages-constaints + - phonetic-languages-constraints-array + - phonetic-languages-filters-array + - phonetic-languages-permutations-array + - phonetic-languages-phonetics-basics + - phonetic-languages-plus - phonetic-languages-simplified-properties-array-old + - phonetic-languages-ukrainian-array - phonetic-languages-vector - phraskell - Phsu @@ -4694,10 +4702,12 @@ broken-packages: - servant-router - servant-scotty - servant-seo + - servant-serf - servant-smsc-ru - servant-stache - servant-static-th - servant-streaming + - servant-streamly - servant-tracing - servant-typed-error - servant-wasm @@ -4870,6 +4880,7 @@ broken-packages: - snake-game - snap-accept - snap-auth-cli + - snap-blaze-clay - snap-configuration-utilities - snap-error-collector - snap-language @@ -5052,7 +5063,6 @@ broken-packages: - streaming-sort - streamly-archive - streamly-binary - - streamly-bytestring - streamly-cassava - streamly-examples - streamly-lmdb @@ -5311,6 +5321,7 @@ broken-packages: - threadscope - threepenny-editors - threepenny-gui-contextmenu + - threepenny-gui-flexbox - thrift - Thrift - throttled-io-loop @@ -5490,6 +5501,7 @@ broken-packages: - type-indexed-queues - type-int - type-interpreter + - typelet - type-level-bst - type-level-natural-number-induction - type-level-natural-number-operations @@ -5522,6 +5534,8 @@ broken-packages: - uhexdump - uhttpc - ui-command + - ukrainian-phonetics-basic-array + - ukrainian-phonetics-basic-array-bytestring - unamb-custom - unbeliever - unbounded-delays-units @@ -5756,6 +5770,7 @@ broken-packages: - webkit-javascriptcore - webmention - web-output + - web-page - web-push - Webrexp - web-routes-quasi @@ -5795,6 +5810,7 @@ broken-packages: - wol - word24 - word2vec-model + - wordchoice - wordify - Wordlint - wordn @@ -5975,6 +5991,7 @@ broken-packages: - yoda - Yogurt - youtube + - yu-auth - yu-core - yuiGrid - yu-tool diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61ab5200ceb..2f37b91d9b49 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -86,6 +86,8 @@ default-package-overrides: - implicit-hie < 0.1.3 # latest version requires Cabal >= 3.8 - shake-cabal < 0.2.2.3 + # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 + - pandoc-crossref < 0.3.15.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -96,6 +98,7 @@ extra-packages: - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 + - apply-refact == 0.11.* # 2023-02-02: needed for hls-hlint-plugin on GHC 9.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - base16-bytestring < 1 # required for cabal-install etc. - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 @@ -157,6 +160,7 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 + - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* - commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3) - ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3 - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 @@ -292,11 +296,12 @@ package-maintainers: - sensei maralorn: - cabal-fmt + - clay - ema - emanote - generic-optics - ghcid - - ghcide + - graphql-client - haskell-language-server - hedgehog - hledger @@ -309,6 +314,8 @@ package-maintainers: - matrix-client - optics - pandoc + - pandoc-cli + - pandoc-crossref - paths - postgresql-simple - purebred-email @@ -322,6 +329,7 @@ package-maintainers: - snap - stm-containers - streamly + - streamly-bytestring - taskwarrior - tz - weeder @@ -461,6 +469,7 @@ unsupported-platforms: bindings-directfb: [ platforms.darwin ] bindings-sane: [ platforms.darwin ] bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r + bytelog: [ platforms.darwin ] # due to posix-api camfort: [ aarch64-linux ] charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 cut-the-crap: [ platforms.darwin ] @@ -564,6 +573,7 @@ supported-platforms: bindings-parport: [ platforms.linux ] # parport is a linux kernel component blake3: [ platforms.x86 ] # uses x86 intrinsics btrfs: [ platforms.linux ] # depends on linux + bytepatch: [ platforms.x86 ] # due to blake3 cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32) crc32c: [ platforms.x86 ] # uses x86 intrinsics d3d11binding: [ platforms.windows ] @@ -607,6 +617,7 @@ supported-platforms: scat: [ platforms.x86 ] # uses scrypt, which requries x86 scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics + tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] Win32-console: [ platforms.windows ] Win32-dhcp-server: [ platforms.windows ] @@ -667,7 +678,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/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index dff7577fedca..e2f7c3b8b708 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.6 +# Stackage LTS 20.8 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -123,9 +123,9 @@ default-package-overrides: - aura ==3.2.9 - authenticate ==1.3.5.1 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.1 + - autodocodec ==0.2.0.2 - autodocodec-openapi3 ==0.2.1.1 - - autodocodec-schema ==0.1.0.2 + - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.2 - auto-update ==0.1.6 @@ -188,7 +188,7 @@ default-package-overrides: - binary-instances ==1.0.3 - binary-list ==1.1.1.2 - binary-orphans ==1.0.3 - - binary-parser ==0.5.7.2 + - binary-parser ==0.5.7.3 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -232,7 +232,7 @@ default-package-overrides: - boots ==0.2.0.1 - bordacount ==0.1.0.0 - boring ==0.2 - - bound ==2.0.5 + - bound ==2.0.6 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 @@ -301,7 +301,7 @@ default-package-overrides: - calligraphy ==0.1.3 - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - - can-i-haz ==0.3.1.0 + - can-i-haz ==0.3.1.1 - capability ==0.5.0.1 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 @@ -340,7 +340,7 @@ default-package-overrides: - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.6.0 - - checksum ==0.0 + - checksum ==0.0.0.1 - chimera ==0.3.3.0 - choice ==0.2.2 - chronologique ==0.3.1.3 @@ -350,7 +350,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.8.0.2 + - citeproc ==0.8.1 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -385,7 +385,7 @@ default-package-overrides: - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - commonmark-extensions ==0.2.3.3 - - commonmark-pandoc ==0.2.1.2 + - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -406,7 +406,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.16 + - concurrent-output ==1.10.17 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -506,9 +506,9 @@ default-package-overrides: - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 - d10 ==1.0.1.2 - - data-accessor ==0.2.3 - - data-accessor-mtl ==0.2.0.4 - - data-accessor-transformers ==0.2.1.7 + - data-accessor ==0.2.3.1 + - data-accessor-mtl ==0.2.0.5 + - data-accessor-transformers ==0.2.1.8 - data-array-byte ==0.1.0.1 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.2 @@ -574,7 +574,7 @@ default-package-overrides: - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - - deriving-aeson ==0.2.8 + - deriving-aeson ==0.2.9 - deriving-compat ==0.6.2 - detour-via-sci ==1.0.0 - df1 ==0.4 @@ -669,10 +669,10 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.2.1.0 - - effectful-core ==2.2.1.0 + - effectful ==2.2.2.0 + - effectful-core ==2.2.2.1 - effectful-plugin ==1.0.0.0 - - effectful-th ==1.0.0.0 + - effectful-th ==1.0.0.1 - either ==5.0.2 - either-both ==0.1.1.1 - either-unwrap ==1.1 @@ -684,12 +684,12 @@ default-package-overrides: - elm-bridge ==0.8.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elynx ==0.7.0.1 - - elynx-markov ==0.7.0.1 - - elynx-nexus ==0.7.0.1 - - elynx-seq ==0.7.0.1 - - elynx-tools ==0.7.0.1 - - elynx-tree ==0.7.0.1 + - elynx ==0.7.1.0 + - elynx-markov ==0.7.1.0 + - elynx-nexus ==0.7.1.0 + - elynx-seq ==0.7.1.0 + - elynx-tools ==0.7.1.0 + - elynx-tree ==0.7.1.0 - emacs-module ==0.1.1.1 - email-validate ==2.3.2.18 - emojis ==0.1.2 @@ -736,7 +736,7 @@ default-package-overrides: - experimenter ==0.1.0.14 - expiring-cache-map ==0.0.6.1 - explainable-predicates ==0.1.2.3 - - explicit-exception ==0.1.10 + - explicit-exception ==0.1.10.1 - exp-pairs ==0.2.1.0 - express ==1.0.10 - extended-reals ==0.2.4.0 @@ -809,7 +809,7 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.3 - focuslist ==0.1.1.0 - - foldl ==1.4.13 + - foldl ==1.4.14 - folds ==0.7.8 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 @@ -1103,7 +1103,7 @@ default-package-overrides: - hkd-default ==1.1.0.0 - hkgr ==0.4.2 - hledger ==1.27.1 - - hledger-interest ==1.6.4 + - hledger-interest ==1.6.5 - hledger-lib ==1.27.1 - hledger-stockquotes ==0.1.2.1 - hledger-ui ==1.27.1 @@ -1123,7 +1123,7 @@ default-package-overrides: - hnock ==0.4.0 - hoauth2 ==2.6.0 - hoogle ==5.0.18.3 - - hopenssl ==2.2.4 + - hopenssl ==2.2.5 - hopfli ==0.2.2.1 - horizontal-rule ==0.5.0.0 - hosc ==0.19.1 @@ -1416,7 +1416,7 @@ default-package-overrides: - lame ==0.2.0 - language-avro ==0.1.4.0 - language-bash ==0.9.2 - - language-c ==0.9.1 + - language-c ==0.9.2 - language-c-quote ==0.13 - language-docker ==12.0.0 - language-dot ==0.1.1 @@ -1429,7 +1429,7 @@ default-package-overrides: - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.3 + - lapack-ffi-tools ==0.1.3.1 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.3 @@ -1481,7 +1481,7 @@ default-package-overrides: - ListLike ==4.7.8 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.3 + - list-t ==1.0.5.6 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1490,7 +1490,7 @@ default-package-overrides: - little-rio ==1.0.1 - lmdb ==0.2.5 - load-env ==0.2.1.0 - - loc ==0.1.4.0 + - loc ==0.1.4.1 - locators ==0.3.0.3 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 @@ -1547,7 +1547,7 @@ default-package-overrides: - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 - - mcmc ==0.8.0.1 + - mcmc ==0.8.1.0 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.2.2 @@ -1579,9 +1579,9 @@ default-package-overrides: - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.11 - microspec ==0.2.1.3 - - microstache ==1.0.2.2 + - microstache ==1.0.2.3 - midair ==0.2.0.1 - - midi ==0.2.2.3 + - midi ==0.2.2.4 - midi-music-box ==0.0.1.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 @@ -1808,7 +1808,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.17.0.0 - optparse-enum ==1.0.0.0 - - optparse-generic ==1.4.8 + - optparse-generic ==1.4.9 - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 @@ -1844,7 +1844,7 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - - partial-semigroup ==0.6.0.0 + - partial-semigroup ==0.6.0.1 - password ==3.0.2.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1858,7 +1858,7 @@ default-package-overrides: - path-io ==1.7.0 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - - path-text-utf8 ==0.0.1.10 + - path-text-utf8 ==0.0.1.11 - pathtype ==0.8.1.1 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 @@ -2361,7 +2361,7 @@ default-package-overrides: - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.2 - - slynx ==0.7.0.1 + - slynx ==0.7.1.0 - smallcheck ==1.2.1 - smtp-mail ==0.3.0.0 - snowflake ==0.1.1.1 @@ -2374,7 +2374,7 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.7 - - sox ==0.2.3.1 + - sox ==0.2.3.2 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 - spdx ==1.0.0.3 @@ -2393,7 +2393,7 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - - spreadsheet ==0.1.3.8 + - spreadsheet ==0.1.3.9 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.2 @@ -2487,7 +2487,7 @@ default-package-overrides: - swish ==0.10.3.0 - syb ==0.7.2.2 - syb-with-class ==0.6.1.14 - - sydtest ==0.13.0.0 + - sydtest ==0.13.0.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 @@ -2540,7 +2540,7 @@ default-package-overrides: - tasty-golden ==2.3.5 - tasty-hedgehog ==1.3.1.0 - tasty-hslua ==1.0.2 - - tasty-hspec ==1.2.0.1 + - tasty-hspec ==1.2.0.2 - tasty-html ==0.4.1.4 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 @@ -2585,7 +2585,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.5.4 + - texmath ==0.12.5.5 - text-ansi ==0.2.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2611,7 +2611,7 @@ default-package-overrides: - th-bang-compat ==0.0.1.0 - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.1.0 + - th-data-compat ==0.1.2.0 - th-desugar ==1.13.1 - th-env ==0.1.1 - these ==1.1.1.1 @@ -2663,7 +2663,7 @@ default-package-overrides: - tls ==1.5.8 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.7.0.1 + - tlynx ==0.7.1.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 @@ -2754,7 +2754,7 @@ default-package-overrides: - uniplate ==1.6.13 - uniq-deep ==1.2.1 - unique ==0.0.1 - - unique-logic ==0.4 + - unique-logic ==0.4.0.1 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - units-parser ==0.1.1.4 @@ -2827,10 +2827,10 @@ default-package-overrides: - vector-extras ==0.2.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.1 + - vector-rotcev ==0.1.0.2 - vector-sized ==1.5.0 - vector-space ==0.16 - - vector-split ==1.0.0.2 + - vector-split ==1.0.0.3 - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 @@ -2942,7 +2942,7 @@ with-compiler: ghc-9.2.5 - xlsx ==1.0.0.1 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - - xml-basic ==0.1.3.1 + - xml-basic ==0.1.3.2 - xmlbf ==0.6.2 - xmlbf-xeno ==0.2.1 - xmlbf-xmlhtml ==0.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 136fe881b2b5..05492ca714ba 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -247,6 +247,7 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 + - LPFP - LPPaver - LambdaHack - LambdaINet @@ -463,7 +464,9 @@ dont-distribute-packages: - algebra-sql - algebraic - algolia + - algorithmic-composition-basic - algorithmic-composition-frequency-shift + - algorithmic-composition-overtones - align-audio - alms - alpha @@ -676,7 +679,7 @@ dont-distribute-packages: - ascii-superset_1_2_5_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_5_1_0 + - ascii_1_5_2_0 - asic - asil - assert4hs-hspec @@ -811,6 +814,7 @@ dont-distribute-packages: - bitcoin-types - bitcoind-regtest - bitcoind-rpc + - bitfield - bitly-cli - bitmaps - bittorrent @@ -1116,7 +1120,6 @@ dont-distribute-packages: - crf-chain1-constrained - crf-chain2-generic - crf-chain2-tiers - - criterion-compare - criu-rpc - crockford - cron-compat @@ -1394,6 +1397,7 @@ dont-distribute-packages: - eventuo11y - eventuo11y-batteries - eventuo11y-json + - eventuo11y-otel - every-bit-counts - ewe - exference @@ -1858,12 +1862,12 @@ dont-distribute-packages: - graph-visit - graphicsFormats - graphicstools - - graphql-client - graphtype - greencard-lib - grenade - gridbounds - gridland + - grisette - groot - gross - groundhog-converters @@ -2201,8 +2205,6 @@ dont-distribute-packages: - hpaco-lib - hpage - hpaste - - hpath-directory - - hpath-io - hpc-tracer - hplayground - hpqtypes-effectful @@ -2252,7 +2254,6 @@ dont-distribute-packages: - hsfacter - hsinspect-lsp - hslogstash - - hslua-module-zip - hsndfile-storablevector - hspec-expectations-pretty - hspec-pg-transact @@ -2369,6 +2370,7 @@ dont-distribute-packages: - instant-deepseq - instant-hashable - instant-zipper + - instrument-cloudwatch - integreat - intel-aes - interpolatedstring-qq @@ -2543,6 +2545,7 @@ dont-distribute-packages: - lapack - lapack-comfort-array - lapack-hmatrix + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2724,8 +2727,6 @@ dont-distribute-packages: - marvin - masakazu-bot - matchers - - math-programming-glpk - - math-programming-tests - mathblog - mathlink - matsuri @@ -2767,6 +2768,7 @@ dont-distribute-packages: - mkbndl - mlist - mmsyn6ukr + - mmsyn6ukr-array - mmsyn7h - mmsyn7s - mmsyn7ukr @@ -3000,6 +3002,7 @@ dont-distribute-packages: - padKONTROL - pairing - panda + - pandoc-crossref_0_3_15_0 - pandoc-highlighting-extensions - pandoc-japanese-filters - pandora-io @@ -3050,6 +3053,8 @@ dont-distribute-packages: - persistable-record - persistable-types-HDBC-pg - persistent-audit + - persistent-event-source + - persistent-eventsource - persistent-hssqlppp - persistent-map - persistent-mtl @@ -3066,8 +3071,15 @@ dont-distribute-packages: - phonetic-languages-general - phonetic-languages-permutations - phonetic-languages-properties + - phonetic-languages-simplified-base - phonetic-languages-simplified-common + - phonetic-languages-simplified-examples-array + - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-array + - phonetic-languages-simplified-generalized-examples-common + - phonetic-languages-simplified-generalized-properties-array - phonetic-languages-simplified-lists-examples + - phonetic-languages-simplified-properties-array - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double - phonetic-languages-ukrainian @@ -3467,6 +3479,7 @@ dont-distribute-packages: - satchmo-funsat - satchmo-toysat - sauron + - sbv-program - sbvPlugin - sc2-lowlevel - sc2-support @@ -3550,7 +3563,6 @@ dont-distribute-packages: - servant-streaming-client - servant-streaming-docs - servant-streaming-server - - servant-streamly - servant-swagger-tags - servant-to-elm - servant-util @@ -3629,7 +3641,6 @@ dont-distribute-packages: - smtlib2-quickcheck - smtlib2-timing - smtp2mta - - snap-blaze-clay - snap-elm - snap-extras - snaplet-actionlog @@ -3741,12 +3752,12 @@ dont-distribute-packages: - streamed - streaming-fft - streaming-process - - streamly-posix - strelka - strelka-wai - strict-containers-lens - strict-containers-serialise - strict-data + - string-interpreter - string-typelits - stripe-haskell - stripe-http-client @@ -3883,7 +3894,6 @@ dont-distribute-packages: - theoremquest-client - thimk - threaded - - threepenny-gui-flexbox - thumbnail-polish - tic-tac-toe - tickle @@ -4127,7 +4137,6 @@ dont-distribute-packages: - weatherhs - web-inv-route - web-mongrel2 - - web-page - web-rep - web-routes-regular - web-routing diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 26d2e2aef4be..4105a01945e8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/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/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4b7201bb6ac9..73986361499a 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -199,7 +199,8 @@ let defaultConfigureFlags = [ "--verbose" "--prefix=$out" - "--libdir=\\$prefix/lib/\\$compiler" + # Note: This must be kept in sync manually with mkGhcLibdir + ("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib") "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") @@ -207,7 +208,7 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -284,10 +285,13 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; + mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; + ghcLibdir = mkGhcLibdir ghc; nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; - buildPkgDb = ghcName: packageConfDir: '' + buildPkgDb = thisGhc: packageConfDir: '' # If this dependency has a package database, then copy the contents of it, # unless it is one of our GHCs. These can appear in our dependencies when # we are doing native builds, and they have package databases in them, but @@ -297,8 +301,8 @@ let # we compile with it, and doing so can result in having multiple copies of # e.g. Cabal in the database with the same name and version, which is # ambiguous. - if [ -d "$p/lib/${ghcName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then - cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ + if [ -d "$p/${mkGhcLibdir thisGhc}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then + cp -f "$p/${mkGhcLibdir thisGhc}/package.conf.d/"*.conf ${packageConfDir}/ continue fi ''; @@ -363,14 +367,14 @@ stdenv.mkDerivation ({ # pkgs* arrays defined in stdenv/setup.hs + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"} + ${buildPkgDb nativeGhc "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '' # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghcNameWithPrefix "$packageConfDir"} + ${buildPkgDb ghc "$packageConfDir"} if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi @@ -510,7 +514,7 @@ stdenv.mkDerivation ({ # just the target specified; "install" will error here, since not all targets have been built. else '' ${setupCommand} copy ${buildTarget} - local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d" + local packageConfDir="$out/${ghcLibdir}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile @@ -539,7 +543,7 @@ stdenv.mkDerivation ({ ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") '' for exe in "${binDir}/"* ; do - install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" + install_name_tool -add_rpath "$out/${ghcLibdir}/${pname}-${version}" "$exe" done ''} @@ -675,7 +679,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html"; "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" - else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}"; + else "${ghcEnv}/${ghcLibdir}"; }); env = envFunc { }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3fb5c3e88a3e..8d054c40d69e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6000,18 +6000,14 @@ self: { }: mkDerivation { pname = "FailT"; - version = "0.1.0.0"; - sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y"; - revision = "2"; - editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891"; + version = "0.1.1.0"; + sha256 = "1hv9zycvsf696x9g73w9jhlipw826vl71gix09jmm02i9jpyr4q2"; libraryHaskellDepends = [ base exceptions mtl text ]; testHaskellDepends = [ base doctest exceptions hspec mtl QuickCheck quickcheck-classes ]; description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FailureT" = callPackage @@ -6335,6 +6331,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "FirstPrelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "FirstPrelude"; + version = "0.1.2.0"; + sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk"; + libraryHaskellDepends = [ base ]; + description = "A version of Prelude suitable for teaching"; + license = lib.licenses.bsd3; + }) {}; + "FixedPoint-simple" = callPackage ({ mkDerivation, base, deepseq, template-haskell }: mkDerivation { @@ -10083,6 +10090,8 @@ self: { pname = "HaXml"; version = "1.25.12"; sha256 = "1xaqp519dw948v00q309msx07yhzxbd0k8ds5q434l6g6cmsqqgc"; + revision = "1"; + editedCabalFile = "1bx5gw3jg6j0rppf5297grw9cv1vccvj5av1hny5i60nrj1725rc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12622,6 +12631,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "LPFP" = callPackage + ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib + , gloss, gnuplot, linear, not-gloss, spatial-math + }: + mkDerivation { + pname = "LPFP"; + version = "1.0"; + sha256 = "0sxl6zwji66blk2vamc6ffb17ibbxp3ypnq14xr2y5vlqj0v2flq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diagrams-cairo diagrams-lib gloss gnuplot not-gloss + spatial-math + ]; + executableHaskellDepends = [ + base diagrams-cairo diagrams-lib gloss gnuplot linear not-gloss + spatial-math + ]; + description = "Code for the book Learn Physics with Functional Programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "LPPaver" = callPackage ({ mkDerivation, aern2-mfun, aern2-mp, base, collect-errors , containers, directory, mixed-types-num, optparse-applicative @@ -14016,6 +14048,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "MissingH_1_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time + , parsec, process, regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.6.0.0"; + sha256 = "0krd15c5c1k92zm1w2qmqwib2gg93bxqz76xmyhcjkx1l229cfzw"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process regex-compat time + unix + ]; + testHaskellDepends = [ + base containers directory filepath HUnit old-time parsec + regex-compat time unix + ]; + description = "Large utility library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -20651,6 +20706,8 @@ self: { pname = "TeX-my-math"; version = "0.202.2.0"; sha256 = "1w074jr2qr603hjh644cvlc0n1miaz10r8mhkskq39jn184kriyl"; + revision = "1"; + editedCabalFile = "1chcybl7wf1kkf4mnjxm3vd7hdjmq6fkc8x1hn9fydln57wjzw0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24903,6 +24960,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad_4_5_3" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , criterion, data-reify, erf, free, nats, reflection, semigroups + , tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.5.3"; + sha256 = "1p4r70s9xslza7ag3ifnf69ji37mkkj2gabfi1lj0fyssm0jyy5y"; + libraryHaskellDepends = [ + adjunctions array base comonad containers data-reify erf free nats + reflection semigroups transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ad-delcont" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -25823,8 +25900,8 @@ self: { }: mkDerivation { pname = "aeson-flowtyped"; - version = "0.13.2.1"; - sha256 = "03zs0mz6fxgvcvfnx3j55yj2hi4npfj10kirjysnx0icypqy6x7g"; + version = "0.14.0"; + sha256 = "1w7bc2i6ncnzyaxrzl1r0p54s7b579q3n83bg5621zn5m2y450gv"; libraryHaskellDepends = [ aeson base containers data-fix deriving-compat free generics-sop mtl recursion-schemes reflection scientific text time @@ -26235,8 +26312,6 @@ self: { ]; description = "Easily consume JSON data on-demand with type-safety"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-serialize" = callPackage @@ -26737,6 +26812,27 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2lagda_0_2023_1_12" = callPackage + ({ mkDerivation, base, directory, filepath, goldplate + , optparse-applicative, process + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2023.1.12"; + sha256 = "0arcap9vpa6yfj7mhdsljrkr0581d3jfnkxr1d8fb35mdawsiikl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ goldplate ]; + description = "Translate .agda files into .lagda.tex files."; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + mainProgram = "agda2lagda"; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27708,6 +27804,7 @@ self: { ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "algorithmic-composition-complex" = callPackage @@ -27758,6 +27855,7 @@ self: { libraryHaskellDepends = [ algorithmic-composition-basic base ]; description = "Some variants of the overtones functions to generate a timbre"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "align" = callPackage @@ -33507,6 +33605,40 @@ self: { mainProgram = "refactor"; }) {}; + "apply-refact_0_12_0_0" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, uniplate + , unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.12.0.0"; + sha256 = "0xwlvygz5mvcsklqxlm34jhibwighp1v0gin2w95j0ncs96s47yc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint process refact syb transformers uniplate unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact syb + transformers uniplate unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact + silently syb tasty tasty-expected-failure tasty-golden transformers + uniplate unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "refactor"; + }) {}; + "apply-unordered" = callPackage ({ mkDerivation, base, fin, ghc, ghc-tcplugins-extra, hspec , should-not-typecheck, syb @@ -34194,8 +34326,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.5"; - sha256 = "1rmxahc4fp62c00k9j4p3952wl2cqny9adlhd7l1h4z3wml7mwsv"; + version = "1.7.6"; + sha256 = "1s6fmz4mz333q8blj0x9c8wl8hh7zxq7b7jz0icdkc53ncghbfhv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -35111,15 +35243,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_5_1_0" = callPackage + "ascii_1_5_2_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.5.1.0"; - sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il"; + version = "1.5.2.0"; + sha256 = "0j5jj23rdv6if9bzindispq2yyn9y2dmbhvxw0dqs7fdcxa7npgq"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -37409,6 +37541,8 @@ self: { pname = "audacity"; version = "0.0.2.1"; sha256 = "04r36gy8z0d2fz1l5px6yajp7izf3zpda9vci6q0wc273pxc8ck6"; + revision = "1"; + editedCabalFile = "0f43s469wgrp6vkiqz1ibnvcv37zjsng2pdzkhhpg9v4syi30r3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37727,8 +37861,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.1"; - sha256 = "1pjv2nk8g7cvck2g6nm15dy2bwg3hqdhyyi4c0q7x2k0awn2qkjg"; + version = "0.2.0.2"; + sha256 = "0mmh6zb660wafizf40a96f30pswv3xyry5r0i0n17w70p3jwa14k"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -37762,8 +37896,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.2"; - sha256 = "0vvwjz8abn6qmk2801p7vyrbjkqcxdqjlc82ha8l9xvb6mmvqy3i"; + version = "0.1.0.3"; + sha256 = "1rb9ff1n0pllx02g1741mkvil2hz5km306pbyqm15h17vlpa5kdw"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -41627,6 +41761,28 @@ self: { license = lib.licenses.mit; }) {}; + "beam-core_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.10.0.0"; + sha256 = "0567j05c3ihr5j3n3pl39x84xp4p6y2haxybwc22acbami1hqrkw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri scientific tagged text time vector + vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -43121,24 +43277,6 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, bytestring, mtl, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "binary-parser"; - version = "0.5.7.2"; - sha256 = "1p17v5fspislzmqy5wxrnmbfg0l0yvm35mk034q4imkmjy0pa1w7"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A highly-efficient but limited parser API specialised for bytestrings"; - license = lib.licenses.mit; - }) {}; - - "binary-parser_0_5_7_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text , transformers @@ -43154,7 +43292,6 @@ self: { ]; description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parsers" = callPackage @@ -45324,6 +45461,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bitfield" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, QuickCheck + , sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "bitfield"; + version = "0.0.0.0"; + sha256 = "1b9jqbcyzp1ajcgjiipjgn1h514kl6zav4ai474x6xalhvwfcpx9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest QuickCheck sydtest validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Generic and easy to use haskell bitfields"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -47132,29 +47287,30 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, criterion - , enummapset, html, httpd-shed, network-uri, non-empty, parallel - , QuickCheck, random, transformers, utility-ht + ({ mkDerivation, array, base, boxes, cgi, combinatorial, containers + , criterion, doctest-exitcode-stdio, doctest-lib, enummapset + , explicit-exception, haha, html, httpd-shed, network-uri + , non-empty, parallel, QuickCheck, random, semigroups + , shell-utility, transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.3"; - sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7"; - revision = "1"; - editedCabalFile = "0rb5bqjg6r8p2v2wfdhivsbgbn55acdjsj6hcy6bv5w50qmg1l6c"; + version = "0.4"; + sha256 = "05lrjgxdg836ik7ry5h9m9diirfc55086winssr9y0g6vbgbifpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base cgi containers enummapset html non-empty QuickCheck - random transformers utility-ht + array base boxes cgi combinatorial containers enummapset + explicit-exception haha html non-empty QuickCheck random semigroups + transformers utility-ht ]; executableHaskellDepends = [ array base cgi containers html httpd-shed network-uri non-empty - random transformers utility-ht + random shell-utility transformers utility-ht ]; testHaskellDepends = [ - array base containers enummapset non-empty QuickCheck random - transformers utility-ht + array base containers doctest-exitcode-stdio doctest-lib enummapset + non-empty QuickCheck random transformers utility-ht ]; benchmarkHaskellDepends = [ base containers criterion enummapset non-empty parallel QuickCheck @@ -48030,8 +48186,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "2.0.5"; - sha256 = "1cnw0q97bys7jcpjds2fb6zkq9pyqxcb8v0b5dvkckqmlp8agn4v"; + version = "2.0.6"; + sha256 = "1mlnpc4x7gn97b8pqiwj3shv23slfylwplp7zr37ar5ff9isbm28"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -48604,7 +48760,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_5" = callPackage + "brick_1_6" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48613,8 +48769,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "1.5"; - sha256 = "0kszp6yrpqc9v87m38rladhmn8xcdbrrh05xr6fi936n34bhi432"; + version = "1.6"; + sha256 = "18vx2p8yfraxb77cd9pvdvsqgm3pcvrkc6wa74jsr7177akgnga6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50368,8 +50524,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.4"; - sha256 = "0c6d8b11dgg585fvql0h2rrmiw2l8831ig2f89jlqzkdsa0asm67"; + version = "1.0.5"; + sha256 = "1ydldi9q9rxggjh6mncg7mwggi0wpigld96nqqgw33ldcid8b7as"; libraryHaskellDepends = [ base bitwise bytestring deepseq panic parameterized-utils random th-lift @@ -50420,8 +50576,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "1.1.1"; - sha256 = "0yy9hd8yhpi175fgnp8cd4h0bifx2zvy82jmbkd28kpbgw6b49vi"; + version = "1.1.2"; + sha256 = "11z9dga8jq3f0h4v0c3s2brrcqb029h6wsn0x97393vkx7pjhai2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50589,6 +50745,7 @@ self: { ]; description = "Fast logging"; license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; }) {}; "byteorder" = callPackage @@ -50613,6 +50770,8 @@ self: { pname = "bytepatch"; version = "0.4.0"; sha256 = "0algbhwzkhj5l98djzhy6ayd4wpldxv75zvqhpp6ckm94ryvb4v9"; + revision = "1"; + editedCabalFile = "1n4cff6wfbgdrw2hn7q1ns346w3mcn6a84v15hw4yzd173pbk4k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50633,10 +50792,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Patch byte-representable data in a bytestream"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + platforms = lib.platforms.x86; mainProgram = "bytepatch"; maintainers = [ lib.maintainers.raehik ]; - broken = true; }) {}; "bytes" = callPackage @@ -50744,14 +50902,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "bytestring_0_11_3_1" = callPackage + "bytestring_0_11_4_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck, random, tasty , tasty-bench, tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "bytestring"; - version = "0.11.3.1"; - sha256 = "0nh75v2hmmcq650q51sv28yprrnnah80spiqvw4js8dy48bqwlah"; + version = "0.11.4.0"; + sha256 = "1lvnjnrsnwbyn5day55fkhzrwggjrabz1rvaq833lsawcbvsw6j9"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck tasty tasty-quickcheck @@ -51569,8 +51727,8 @@ self: { pname = "c2hs"; version = "0.28.8"; sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; - revision = "1"; - editedCabalFile = "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2"; + revision = "2"; + editedCabalFile = "14j3sjxvwhj32zpz0iyigc6wdn6pjm3vlgs0prq0grvk48p176f3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -52787,8 +52945,8 @@ self: { }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.4"; - sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b"; + version = "0.0.5.5"; + sha256 = "0lxw7kbqpaf4j03rrlivkb0imvnw0wsnxjy8gvcjs0jb101dzf8g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -54133,8 +54291,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, HUnit, mtl }: mkDerivation { pname = "can-i-haz"; - version = "0.3.1.0"; - sha256 = "0pwwl5pawvd1sygc8k7ichfk15inhcy4has40zplqqws5lmm6mz8"; + version = "0.3.1.1"; + sha256 = "19518f7xrki9igv4i9ish1v3cgix5g0mgvwrkrjgq3ny2jwmqljw"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base deepseq hspec HUnit mtl ]; description = "Generic implementation of the Has and CoHas patterns"; @@ -54627,8 +54785,8 @@ self: { }: mkDerivation { pname = "car-pool"; - version = "0.0.1"; - sha256 = "1y674qnixmk6l4yvbvz3vsxzpfchy5vq0qsn4b2xyziqxscz9aih"; + version = "0.0.1.1"; + sha256 = "0xbaaynw0bi18lbdxa0n0ypd8qkn6x4y7i7vsan2zawwbkn264sg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56788,8 +56946,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.5.0.0"; - sha256 = "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a"; + version = "3001.5.0.1"; + sha256 = "044gfqfdw5xdr6mzp5i3956a5fcj15j32zwzzd6ym15nxgrvjqh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57693,8 +57851,8 @@ self: { ({ mkDerivation, base, explicit-exception, utility-ht }: mkDerivation { pname = "checksum"; - version = "0.0"; - sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; + version = "0.0.0.1"; + sha256 = "1p1ys40jjndbq4p5hr64ps464yd5brv1nf821crr6ncfcw8h3742"; libraryHaskellDepends = [ base explicit-exception utility-ht ]; description = "Compute and verify checksums of ISBN, IBAN, etc"; license = lib.licenses.bsd3; @@ -57778,8 +57936,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.0"; - sha256 = "0hmj9dvsvwrp7ab4zrzmbvmzy0q6fr2ifzmdp4ajbxlmca0yh3py"; + version = "0.9.3.1"; + sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59017,8 +59175,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.8.0.2"; - sha256 = "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw"; + version = "0.8.1"; + sha256 = "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59861,8 +60019,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "clckwrks" = callPackage @@ -60231,19 +60388,24 @@ self: { "clerk" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, lens - , mtl, text, time, transformers, xlsx + , lima, mtl, text, time, transformers, typed-process, xlsx }: mkDerivation { pname = "clerk"; - version = "0.1.0.2"; - sha256 = "0nbli8pj7v4wblbji2hqlkwbh98iiclg7vpbg6qsa91bw8p4nwmd"; + version = "0.1.0.3"; + sha256 = "01bxj0znkk8gizn0ilslzn07x4rm716ghpckwfqf7ilh78q5jfnd"; libraryHaskellDepends = [ base bytestring containers data-default lens mtl text time transformers xlsx ]; - description = "Declaratively describe spreadsheets and generate xlsx"; + testHaskellDepends = [ + base bytestring containers data-default lens mtl text time + transformers typed-process xlsx + ]; + testToolDepends = [ lima ]; + description = "Declaratively describe spreadsheets"; license = lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) lima;}; "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative @@ -61901,24 +62063,25 @@ self: { "cobot-io" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring, cobot - , containers, data-msgpack, deepseq, directory, hspec, http-conduit - , hyraxAbif, lens, linear, megaparsec, mtl, neat-interpolation - , parser-combinators, QuickCheck, split, text, vector + , containers, data-msgpack, deepseq, directory, filepath, hspec + , http-conduit, hyraxAbif, lens, linear, megaparsec, mtl + , neat-interpolation, parser-combinators, QuickCheck, split, text + , vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.4.4"; - sha256 = "04dizmriis6zs7jfwbagnzrszlmky8xkvrsmxb8wra90fnww8l66"; + version = "0.1.5.1"; + sha256 = "0k26qzrd1j744dg5is26gmh99xawf25wzlj72wmlc56nx5rc6cfx"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec - mtl parser-combinators split text vector + data-msgpack deepseq filepath http-conduit hyraxAbif lens linear + megaparsec mtl parser-combinators split text vector ]; testHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq directory hspec http-conduit hyraxAbif lens - linear megaparsec mtl neat-interpolation parser-combinators - QuickCheck split text vector + data-msgpack deepseq directory filepath hspec http-conduit + hyraxAbif lens linear megaparsec mtl neat-interpolation + parser-combinators QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = lib.licenses.bsd3; @@ -63489,8 +63652,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.10.2.0"; - sha256 = "1cp7g04ag1pkcqlckpzxfq3x4vw7yd6v9vzhhp228pjc1f36iqgx"; + version = "0.11.0.0"; + sha256 = "01c968r4qzvqbjwqwhp1xk7s59wsbaas9jvdfi2sgk2jk6vg0ss3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63636,8 +63799,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1.2"; - sha256 = "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap"; + version = "0.2.1.3"; + sha256 = "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"; libraryHaskellDepends = [ base commonmark commonmark-extensions pandoc-types text ]; @@ -65431,24 +65594,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.10.16"; - sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; - revision = "1"; - editedCabalFile = "0ak0nnfznsvq3vs8czsnlrw586hw4hj3299y75p7rhqi5jyvi932"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_17" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -65462,7 +65607,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "concurrent-resource-map" = callPackage @@ -68877,6 +69021,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_9_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.9.0"; + sha256 = "126z21i4f7z7pf415jjqjd4ik6sb9kid1dgrlc2yzq2vd4wdi9gg"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -68916,6 +69078,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_6_2_1" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, hashable, hourglass, mtl + , prettyprinter, safe-exceptions, stm, template-haskell + , terminal-size, text, text-short, transformers, typed-process + , unix, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.6.2.1"; + sha256 = "13dxd290479aam366g5dcwhqpp3mxxzdcmn86c85197m2darrkhv"; + libraryHaskellDepends = [ + base bytestring core-data core-text directory exceptions filepath + fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm + template-haskell terminal-size text text-short transformers + typed-process unix unliftio-core + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl @@ -70583,6 +70767,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; + broken = true; }) {}; "criterion-measurement" = callPackage @@ -71706,6 +71891,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptostore_0_3_0_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, basement + , bytestring, cryptonite, hourglass, memory, pem, tasty + , tasty-hunit, tasty-quickcheck, x509, x509-validation + }: + mkDerivation { + pname = "cryptostore"; + version = "0.3.0.0"; + sha256 = "0s6r7pjdp2jqqxq0b1f1ks23h1dh8hh4vqzbqm8irgvmsz445pwh"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base basement bytestring cryptonite + hourglass memory pem x509 x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass memory pem tasty + tasty-hunit tasty-quickcheck x509 + ]; + description = "Serialization of cryptographic data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -73090,6 +73297,8 @@ self: { pname = "cutter"; version = "0.0"; sha256 = "1hka1k012d2nwnkbhbiga6307v1p5s88s2nxkrnymvr0db1ijwqi"; + revision = "1"; + editedCabalFile = "00fh0bhdlsrik1mq1hm3w6dg4m9c03bk22c3ans309dk5swr9hcy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73897,8 +74106,8 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "data-accessor"; - version = "0.2.3"; - sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + version = "0.2.3.1"; + sha256 = "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; @@ -73951,8 +74160,8 @@ self: { ({ mkDerivation, base, data-accessor, mtl }: mkDerivation { pname = "data-accessor-mtl"; - version = "0.2.0.4"; - sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; + version = "0.2.0.5"; + sha256 = "0xnd5l961530yzpzrkv13jz8lv42szs8ra75nnw8rzkwaijsvi4r"; libraryHaskellDepends = [ base data-accessor mtl ]; description = "Use Accessor to access state in mtl State monad class"; license = lib.licenses.bsd3; @@ -73980,8 +74189,8 @@ self: { ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { pname = "data-accessor-transformers"; - version = "0.2.1.7"; - sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"; + version = "0.2.1.8"; + sha256 = "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83"; libraryHaskellDepends = [ base data-accessor transformers ]; description = "Use Accessor to access state in transformers State monad"; license = lib.licenses.bsd3; @@ -73995,6 +74204,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; + revision = "1"; + editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -74904,6 +75115,8 @@ self: { pname = "data-interval"; version = "2.1.1"; sha256 = "1gxdf1pi54s9fvxgp112b0l9f4q4r29f03caz04wbhv1f6cbs912"; + revision = "1"; + editedCabalFile = "0b7wljz2xcj8j2aka343i19rzw2lva5bbd4wp9wmrzlafp8anxpd"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -77355,8 +77568,8 @@ self: { pname = "decimal-literals"; version = "0.1.0.1"; sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; - revision = "1"; - editedCabalFile = "0giz73yb179xvww1s92dbl4mhvcxlv25f0zrjwc9lsvx9h2aivg0"; + revision = "2"; + editedCabalFile = "0wrjxapnv7i20krg601jzqik3pns6s7kr3c2x99n4lqi43b1a2v9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -78154,8 +78367,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.6.0"; - sha256 = "1r3pd00jlbqc8z61a1s5iwzp9y1lbqvs55sc9f495fg8m35zxcqz"; + version = "0.6.8.0"; + sha256 = "1r0v6mvl1z5zxiwgrbx8bij6i2yv8cwwlh5x4cs5im174la6irfv"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78776,20 +78989,6 @@ self: { }) {}; "deriving-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring }: - mkDerivation { - pname = "deriving-aeson"; - version = "0.2.8"; - sha256 = "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"; - revision = "1"; - editedCabalFile = "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"; - libraryHaskellDepends = [ aeson base ]; - testHaskellDepends = [ aeson base bytestring ]; - description = "Type driven generic aeson instance customisation"; - license = lib.licenses.bsd3; - }) {}; - - "deriving-aeson_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; @@ -78799,7 +78998,6 @@ self: { testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "deriving-compat" = callPackage @@ -78855,19 +79053,21 @@ self: { "deriving-trans" = callPackage ({ mkDerivation, base, exceptions, monad-control - , monad-control-identity, mtl, transformers, transformers-base - , unliftio-core + , monad-control-identity, mtl, primitive, random, resourcet + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.5.1.0"; - sha256 = "1k6j66v2wcqhcbf7rrj4qsm7fdf68g0i6yslcjdrricdh8b7r9w2"; + version = "0.6.1.0"; + sha256 = "0zkl41kyq7s6gm37y4cwjim7b65fa2vmxqxfsmm9p5r6pkrn46d7"; libraryHaskellDepends = [ - base exceptions monad-control monad-control-identity mtl - transformers transformers-base unliftio-core + base exceptions monad-control monad-control-identity mtl primitive + random resourcet transformers transformers-base unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "derivingvia-extras" = callPackage @@ -80941,6 +81141,8 @@ self: { pname = "dice"; version = "0.1.1"; sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; + revision = "1"; + editedCabalFile = "1006bnawdn3fp76q2arz62q5dkkxgix18m7bcrb63xjzhssm09xy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec random random-fu ]; @@ -81115,6 +81317,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; + revision = "1"; + editedCabalFile = "1macpybgwxyak0cgpimkjqzzn0xf4mkyj9n0papjzxjaw3iv4vmd"; libraryHaskellDepends = [ base fingertree show-combinators ]; description = "Map file locations across diffs"; license = lib.licenses.mit; @@ -81314,6 +81518,19 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; + "digest_0_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, zlib }: + mkDerivation { + pname = "digest"; + version = "0.0.1.5"; + sha256 = "1lpj16hazg8yh2rxspc1y7da9vgmz6jw9fx9qrvwv1hzmv8mvnvv"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ zlib ]; + description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "digest-pure" = callPackage ({ mkDerivation, array, base, bytestring, digest, QuickCheck }: mkDerivation { @@ -86596,10 +86813,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.2.1.0"; - sha256 = "1fxamg2npi1arhsjyxgbzcn50m3y9kn9ganc79gbn8xcx252rp63"; - revision = "1"; - editedCabalFile = "0fxsf82kqnfy6nn8805x6dksj6j5z0dyajb4nh47r3sq067jb1n0"; + version = "0.2.1.1"; + sha256 = "0rqh1sy500gbgqr69z220yb8g7gp117z0iw1kly9zxqhrzn3sv9f"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -87786,6 +88001,26 @@ self: { broken = true; }) {}; + "ebml" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, split, tasty + , tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "ebml"; + version = "0.1.0.0"; + sha256 = "0v0mf7l3fmdyr5981r3n7k4g1mh3nanl9qnsm87zdwpwkfhik7hq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base binary bytestring containers text ]; + executableHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base binary bytestring split tasty tasty-golden tasty-hunit text + ]; + description = "A pure EBML parser"; + license = lib.licenses.bsd3; + mainProgram = "haskell-ebml"; + }) {}; + "ebnf-bff" = callPackage ({ mkDerivation, aeson, base, bytestring, cond, directory, parsec , text @@ -87853,8 +88088,8 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.3"; - sha256 = "16jysii88v1wkm3g7vjx9vdhzcjqq1dlfrjkf2hccrcxz8wqv4d1"; + version = "0.2.3.1"; + sha256 = "1fqld8cqrknnd18v8c92awilfdrc07lja6347zqkr4kin4b5s7s4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptohash-sha512 integer-gmp @@ -88459,30 +88694,6 @@ self: { }) {}; "effectful" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , effectful-core, exceptions, lifted-base, primitive, process, stm - , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio - }: - mkDerivation { - pname = "effectful"; - version = "2.2.1.0"; - sha256 = "0p2kr9vcyhcpvyrqbvwmjjh4k2lsrrhhq6rdi087iyvd7vj33al2"; - libraryHaskellDepends = [ - async base bytestring directory effectful-core process stm time - unliftio - ]; - testHaskellDepends = [ - base containers effectful-core exceptions lifted-base primitive - tasty tasty-hunit unliftio - ]; - benchmarkHaskellDepends = [ - async base tasty-bench text unix unliftio - ]; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - }) {}; - - "effectful_2_2_2_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , effectful-core, exceptions, lifted-base, primitive, process, stm , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio @@ -88504,27 +88715,9 @@ self: { ]; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-core" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control - , primitive, transformers-base, unliftio-core - }: - mkDerivation { - pname = "effectful-core"; - version = "2.2.1.0"; - sha256 = "0439fk1gr2jq663zl6p0ra9hkzmjm9ad24wnbrbz1nnl5v01ay2s"; - libraryHaskellDepends = [ - base containers exceptions monad-control primitive - transformers-base unliftio-core - ]; - doHaddock = false; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - }) {}; - - "effectful-core_2_2_2_1" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core }: @@ -88538,7 +88731,6 @@ self: { ]; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-plugin" = callPackage @@ -88559,6 +88751,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc + , ghc-tcplugins-extra + }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.0"; + sha256 = "13m63lidazn8cp2f0y801nwri48h5mny3azsz5gpz1c7jj072xaa"; + libraryHaskellDepends = [ + base containers effectful-core ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -88573,20 +88782,18 @@ self: { }) {}; "effectful-th" = callPackage - ({ mkDerivation, base, containers, effectful, exceptions + ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.0"; - sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; - revision = "3"; - editedCabalFile = "1nqwvgdvqgh4dvkidyaga7jd95p3hn54hy5gwadsvyf9lll4vjck"; + version = "1.0.0.1"; + sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; libraryHaskellDepends = [ - base containers effectful exceptions template-haskell + base containers effectful-core exceptions template-haskell th-abstraction ]; - testHaskellDepends = [ base effectful ]; + testHaskellDepends = [ base effectful-core ]; description = "Template Haskell utilities for the effectful library"; license = lib.licenses.bsd3; }) {}; @@ -89015,8 +89222,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.6"; - sha256 = "1zmd728dxxifvpj7zwzb87rfmgs3wiz75d2g2lcm2sr0yafvzan4"; + version = "0.0.4.7"; + sha256 = "12j8jbbh5p9bmb1gwza4j38rynpp9x9vs30bbiaqf44jijzmkb53"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -90100,8 +90307,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.7.0.1"; - sha256 = "1r2d3v2y4xmqf45d7649d54f1dsrywil2km40qx951adrawp8g0q"; + version = "0.7.1.0"; + sha256 = "1k6hxsxcqlrfrcww1n31kidn5y7kafz9fm2qflj7zrcxpfpi9skj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90120,8 +90327,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.7.0.1"; - sha256 = "0dci3fpvyxjffn2lapdddj8flyk2id2b9z0shfidcknaghgig1gr"; + version = "0.7.1.0"; + sha256 = "1m4nrpm3g9zwk1gf0v93nlr8vb5pd8sgn1mnzj6b968vq3zb2ab3"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random random statistics vector @@ -90139,8 +90346,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.7.0.1"; - sha256 = "0rf1ydwhglcnvp3cdqhij859c3gn7l54nazw4501b6wj59ky7p75"; + version = "0.7.1.0"; + sha256 = "0yl3wkk5nz5hn11h1rmpmp7vzjf94n6bmylq16cik44kj1723y59"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -90155,8 +90362,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.7.0.1"; - sha256 = "1zjg9kayk97xqxpd6pryypmk9p69ylcyycfdzccj9pssqx99i5bi"; + version = "0.7.1.0"; + sha256 = "08wcikxgzl0j60xzffih5fd3mjbjisf17gr5aa1njjhs0vh6y8mg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices parallel primitive random vector vector-th-unbox word8 @@ -90177,8 +90384,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.7.0.1"; - sha256 = "1lqsmpdwxg9b6v7hm8aizgwzcwp4kspvc6wphk6nlj34dxsjy673"; + version = "0.7.1.0"; + sha256 = "14dhq49ri7wndzkpiwv28r5w85wiwq3x2c00yz1x5ax3347jcdgh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 directory hmatrix optparse-applicative random @@ -90192,18 +90399,17 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq - , double-conversion, elynx-nexus, elynx-tools, hspec - , math-functions, microlens, parallel, QuickCheck - , quickcheck-classes, random, statistics + , elynx-nexus, elynx-tools, hspec, math-functions, microlens + , parallel, QuickCheck, quickcheck-classes, random, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.7.0.1"; - sha256 = "0f9fmwv0580027qhlcffkzvx55nccx43klgkdbjnrhdqvd7h5a1s"; + version = "0.7.1.0"; + sha256 = "0jcqz49ml20cg0mwkpqjci44fkbcjhxf6dhhl8y68yczlz0778zs"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers - data-default-class deepseq double-conversion elynx-nexus - math-functions parallel random statistics + data-default-class deepseq elynx-nexus math-functions parallel + random statistics ]; testHaskellDepends = [ attoparsec base bytestring containers data-default elynx-tools @@ -91731,8 +91937,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.3"; - sha256 = "1akj045b5554bmlbg94vaji1ly10n89xj1vip9ywamy5hv18bdz5"; + version = "0.0.5.4"; + sha256 = "13gf8f8ik1wdr8n8sa1jlzzfh1bi2892fb5bhmixlxk0d81dm76i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93749,14 +93955,15 @@ self: { "eventuo11y" = callPackage ({ mkDerivation, base, exceptions, general-allocate, monad-control - , mtl, primitive, transformers, transformers-base, unliftio-core + , mtl, primitive, time, transformers, transformers-base + , unliftio-core }: mkDerivation { pname = "eventuo11y"; - version = "0.6.0.0"; - sha256 = "1zk49cfg2cab5h5xy2bghk643aq6p0zi937linnxgl53c21br1li"; + version = "0.9.0.0"; + sha256 = "0ayzk79z2xvkhlmr6yg9q52kdjh68ahsi9hhc0bi58zg46dnq18i"; libraryHaskellDepends = [ - base exceptions general-allocate monad-control mtl primitive + base exceptions general-allocate monad-control mtl primitive time transformers transformers-base unliftio-core ]; description = "An event-oriented observability library"; @@ -93774,8 +93981,8 @@ self: { }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.3.0.0"; - sha256 = "12agwfk89jxsa2hdy5ghvkjddp2xs58973r4zi5zsf3zzx7nlx56"; + version = "0.4.0.0"; + sha256 = "04b1rigdxv5v2j8r7lfbl15a1hr9ifra9lnkxxc1j1symbpq620m"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y eventuo11y-json general-allocate http-media http-types @@ -93805,8 +94012,8 @@ self: { }: mkDerivation { pname = "eventuo11y-json"; - version = "0.2.0.0"; - sha256 = "132dkvsp1p5lj103amsfkn9grc4rx7qgs2nh5506mybykhhhzzg5"; + version = "0.3.0.2"; + sha256 = "1q60hb7zaa3gifbsf1d7zl1bclz21ysmb3g1ww5xz4hr5fy03ksi"; libraryHaskellDepends = [ aeson base bytestring eventuo11y eventuo11y-dsl template-haskell text time uuid @@ -93816,6 +94023,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventuo11y-otel" = callPackage + ({ mkDerivation, base, eventuo11y, hs-opentelemetry-api, text }: + mkDerivation { + pname = "eventuo11y-otel"; + version = "0.1.0.2"; + sha256 = "0mv97s3vnw7ppry3vinis6dv0j93pj5dywp0xzxrcsw9nbwiy3gj"; + libraryHaskellDepends = [ + base eventuo11y hs-opentelemetry-api text + ]; + description = "OpenTelemetry-based rendering for eventuo11y"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -93869,8 +94090,8 @@ self: { }: mkDerivation { pname = "evoke"; - version = "0.2022.8.26"; - sha256 = "05jyak1dmb4cw4gp5p71pv8imkfachylq8bak81jmg6ni2shp28j"; + version = "0.2023.1.26"; + sha256 = "0c03ggjx7amcjqylcadshknqwqm9x6mlsa9d6np1vff6asf8s8b4"; libraryHaskellDepends = [ base ghc text ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 @@ -94161,6 +94382,8 @@ self: { pname = "exceptions"; version = "0.10.7"; sha256 = "0jb0ah5k2mb4clhb34c59f615vzl54lhx3hf6njqsgdmr3jashls"; + revision = "1"; + editedCabalFile = "05hqkph2rd7vkgbggbpa13i3r8wvb2fgsan40cd8macggwkw5k30"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -94993,8 +95216,8 @@ self: { ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.10"; - sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; + version = "0.1.10.1"; + sha256 = "1pv57m0ynwfljnr0g3snpc716q497l4h9x0d66vj46jgp909iw79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -95002,6 +95225,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "explicit-exception_0_2" = callPackage + ({ mkDerivation, base, deepseq, semigroups, transformers }: + mkDerivation { + pname = "explicit-exception"; + version = "0.2"; + sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; + description = "Exceptions which are explicit in the type signature"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "explicit-iomodes" = callPackage ({ mkDerivation, base, base-unicode-symbols, tagged }: mkDerivation { @@ -95520,6 +95757,34 @@ self: { broken = true; }) {}; + "extism" = callPackage + ({ mkDerivation, base, bytestring, extism, extism-manifest, HUnit + , json + }: + mkDerivation { + pname = "extism"; + version = "0.1.0"; + sha256 = "1gg359qwvqk8qqwd9s6hlrka0x3ajf1v3g750iyw1vyy74dakx8x"; + libraryHaskellDepends = [ base bytestring extism-manifest json ]; + librarySystemDepends = [ extism ]; + testHaskellDepends = [ base bytestring HUnit ]; + description = "Extism bindings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {extism = null;}; + + "extism-manifest" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, json }: + mkDerivation { + pname = "extism-manifest"; + version = "0.1.0"; + sha256 = "0dr3pxkf11cija6k75rv5mzmracw1yyis82sj7x2blkjg190hk6s"; + libraryHaskellDepends = [ base base64-bytestring bytestring json ]; + description = "Extism manifest bindings"; + license = lib.licenses.bsd3; + }) {}; + "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix @@ -96330,6 +96595,8 @@ self: { pname = "fast-logger"; version = "3.1.1"; sha256 = "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"; + revision = "1"; + editedCabalFile = "012rrm13hnaz06ssy7m8z36l8aajayd9pbk19q042wrfwsvb7jjl"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -97023,6 +97290,18 @@ self: { mainProgram = "fcd"; }) {}; + "fcf-base" = callPackage + ({ mkDerivation, base, fcf-family }: + mkDerivation { + pname = "fcf-base"; + version = "0.1.0.0"; + sha256 = "19jrcpj496bpchv8fw30vd5b5w3sj1qkzmh5jlahyvz5wsppzwsq"; + libraryHaskellDepends = [ base fcf-family ]; + testHaskellDepends = [ base fcf-family ]; + description = "Family-of-families instances for base"; + license = lib.licenses.mit; + }) {}; + "fcf-composite" = callPackage ({ mkDerivation, base, composite-base, fcf-containers , first-class-families, tasty, tasty-hunit, vinyl @@ -97051,8 +97330,8 @@ self: { }: mkDerivation { pname = "fcf-containers"; - version = "0.7.1"; - sha256 = "1234vz8ha4wzzbxnw3za5kdhisd37n8v3sd01rdcmnmnhb7fv3qs"; + version = "0.7.2"; + sha256 = "0lw7zm5k4mkvzxxmhp2lbanlkgb3n6gp583g34r53rz576bhhhj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; @@ -97064,6 +97343,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "fcf-family" = callPackage + ({ mkDerivation, base, containers, first-class-families + , template-haskell + }: + mkDerivation { + pname = "fcf-family"; + version = "0.2.0.0"; + sha256 = "17v811dfdvgdvhwri34df3sf3n82crd41pi28j8gbdqs4zg0lgln"; + libraryHaskellDepends = [ + base containers first-class-families template-haskell + ]; + testHaskellDepends = [ base first-class-families ]; + description = "Family of families: featherweight defunctionalization"; + license = lib.licenses.mit; + }) {}; + "fcf-graphs" = callPackage ({ mkDerivation, base, doctest, fcf-containers , first-class-families, Glob @@ -98202,14 +98497,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_0_0" = callPackage + "fgl_5_8_1_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.0.0"; - sha256 = "02cdigf5m3520vh30lld0j5d4al7nmsa4m9v9bjw1fprfaac03nn"; + version = "5.8.1.0"; + sha256 = "0s53kxz6a79jclvxlzpmzs2x98qx48xvgwswh6cal2f4rg2wp8av"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -98475,6 +98770,8 @@ self: { pname = "file-io"; version = "0.1.0.1"; sha256 = "1kxr2cdv3zmml7v3gmk2zrd2kwvph46fzv3r2ia5brq5qvm2s544"; + revision = "1"; + editedCabalFile = "0kfisk0vrjviw194rg2ildzr0qlg45wk4cwa4s3qpl3hp4zag1lj"; libraryHaskellDepends = [ base bytestring filepath unix ]; description = "Basic file IO operations via 'OsPath'"; license = lib.licenses.bsd3; @@ -98624,6 +98921,8 @@ self: { pname = "filemanip"; version = "0.3.6.3"; sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8"; + revision = "1"; + editedCabalFile = "1l53qqlh9w7572n5dxk8rq0p8vsvg6m1afbak6xzdx0kgg8j6y8a"; libraryHaskellDepends = [ base bytestring directory filepath mtl unix-compat ]; @@ -101440,8 +101739,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.2.1.0"; - sha256 = "0sbqlii75sjmha2kmiwi36r2wdkpxdargyrrv2g60vpryvndiqck"; + version = "0.3.0.0"; + sha256 = "0n5cfihda5mhww9kb81mdhswz01bzwsrmhyh4mknsws6im8rbrpz"; + revision = "1"; + editedCabalFile = "0wgdl703cr9m5p3azzgrv1ljvrpr1b9w3nx7w6v2g3sdgj1pqf90"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -101467,10 +101768,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.13"; - sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"; - revision = "1"; - editedCabalFile = "0wkjdxjyjyq9kv9hwa5k8k8fp6i0b77xf9b2prrzyq0cwlps016i"; + version = "1.4.14"; + sha256 = "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -102766,6 +103065,8 @@ self: { pname = "fpe"; version = "0.1.1"; sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + revision = "1"; + editedCabalFile = "0qf0qsh3ig76s8inimcwr5yksyzpz3szn80qi599zhv66nflqilf"; libraryHaskellDepends = [ base bytestring integer-logarithms vector ]; @@ -107121,8 +107422,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.0.1"; - sha256 = "0n6szggdafnn8s3s4n737q8s8d1jfnz9cb4v25rsz508q56mghzl"; + version = "0.2.1.1"; + sha256 = "0jcqknrlpcyl825y9r612mh8d7dcs68sxjm1j600nbdl4ksw8qmb"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -108050,8 +108351,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.8"; - sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; + version = "0.7.9"; + sha256 = "0dkzma11nd7hc1xsriiq50nxr8h50sh1y562yjsqaganxh2sprsx"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; @@ -109018,8 +109319,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.4.1"; - sha256 = "0rnp4ma5gxxd2lf9n36ifbw2jr0nl6jfxqzvvp86mlvs3a7jpsxd"; + version = "0.2.4.2"; + sha256 = "0ms2gfhcrxcfg10s3xpaawz4kqs4dy00p5mgc7s6pjiq5qgj4mn4"; libraryHaskellDepends = [ base containers deepseq mono-traversable simple-affine-space ]; @@ -109128,6 +109429,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "getopt-generics_0_13_1_0" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13.1.0"; + sha256 = "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + description = "Create command line interfaces with ease"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -110818,8 +111139,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.8.3.0"; - sha256 = "0qrb8zz93rb25p8f4dhh2bxx3vb0yc92rx59xbh23ixijiszhas8"; + version = "0.9.0.0"; + sha256 = "1z14z12lhdc1bfa3qnq2srx0cm14cbkg7af94cdfqpqmbxjgw5h3"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -111322,7 +111643,6 @@ self: { testToolDepends = [ implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "ghcide-bench" = callPackage @@ -111665,24 +111985,24 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base - , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan - , case-insensitive, casing, containers, cryptohash-sha256, deepseq - , directory, disk-free-space, exceptions, filepath - , generic-arbitrary, haskus-utils-types, haskus-utils-variant - , hspec, hspec-discover, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, mtl, optics, optparse-applicative - , os-release, pretty, pretty-terminal, process, QuickCheck - , quickcheck-arbitrary-adt, regex-posix, resourcet, retry, safe - , safe-exceptions, split, streamly, strict-base, tagsoup - , template-haskell, temporary, terminal-size, text, time - , transformers, unix, unix-bytestring, unliftio-core + , base16-bytestring, binary, bytestring, bz2, Cabal + , cabal-install-parsers, cabal-plan, case-insensitive, casing + , containers, cryptohash-sha256, deepseq, directory + , disk-free-space, exceptions, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, libarchive, lzma-static, megaparsec, mtl + , optics, optparse-applicative, os-release, pretty, pretty-terminal + , process, QuickCheck, quickcheck-arbitrary-adt, regex-posix + , resourcet, retry, safe, safe-exceptions, split, streamly + , strict-base, tagsoup, template-haskell, temporary, terminal-size + , text, time, transformers, unix, unix-bytestring, unliftio-core , unordered-containers, uri-bytestring, utf8-string, vector , versions, word8, yaml-streamly, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.18.0"; - sha256 = "09mg0pg520vn4mcc0s59wzssnnj5ps5z50kri8z53bjvn4yfdwvv"; + version = "0.1.19.0"; + sha256 = "00g91zavfd58y17q723izch9j0x3fhx7a14ng061am5h41i76mlq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111697,17 +112017,17 @@ self: { word8 yaml-streamly zlib ]; executableHaskellDepends = [ - aeson aeson-pretty async base bytestring cabal-plan containers - deepseq directory filepath haskus-utils-types haskus-utils-variant - libarchive megaparsec mtl optparse-applicative pretty - pretty-terminal process resourcet safe safe-exceptions tagsoup - template-haskell temporary text unix unordered-containers + aeson aeson-pretty async base bytestring cabal-install-parsers + cabal-plan containers deepseq directory filepath haskus-utils-types + haskus-utils-variant libarchive megaparsec mtl optparse-applicative + pretty pretty-terminal process resourcet safe safe-exceptions + tagsoup template-haskell temporary text unix unordered-containers uri-bytestring utf8-string vector versions yaml-streamly ]; testHaskellDepends = [ base bytestring containers directory filepath generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt - streamly text uri-bytestring versions + streamly text unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; @@ -113415,8 +113735,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221212"; - sha256 = "0afnl2w29w4j0229rsla93dzkmhcjlp8dv76sr861n186ywv8rzg"; + version = "10.20230126"; + sha256 = "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -115358,15 +115678,13 @@ self: { ({ mkDerivation, base, derive-storable, glpk, hspec }: mkDerivation { pname = "glpk-headers"; - version = "0.5.0"; - sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5"; + version = "0.5.1"; + sha256 = "05rkpfrcyvynqifd6fnvmj3kcp5dfgf96fjygazx6jjrw538wnd9"; libraryHaskellDepends = [ base derive-storable ]; librarySystemDepends = [ glpk ]; testHaskellDepends = [ base hspec ]; description = "Low-level Haskell bindings to the GLPK library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -120074,8 +120392,8 @@ self: { ]; description = "A client for Haskell programs to query a GraphQL API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "graphql-codegen"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "graphql-spice" = callPackage @@ -120739,6 +121057,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grisette" = callPackage + ({ mkDerivation, array, base, bytestring, call-stack, deepseq + , doctest, generic-deriving, Glob, hashable, hashtables, intern + , loch-th, mtl, once, sbv, tasty, tasty-hunit, tasty-quickcheck + , tasty-test-reporter, template-haskell, th-compat, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "grisette"; + version = "0.1.0.0"; + sha256 = "1dl972402pyk6i636w1547hdpyhhaikfzfpvqp19jrwgm5fdnifi"; + libraryHaskellDepends = [ + array base bytestring call-stack deepseq generic-deriving hashable + hashtables intern loch-th mtl once sbv template-haskell th-compat + transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring call-stack deepseq doctest generic-deriving + Glob hashable hashtables intern loch-th mtl once sbv tasty + tasty-hunit tasty-quickcheck tasty-test-reporter template-haskell + th-compat transformers unordered-containers vector + ]; + description = "Symbolic evaluation as a library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -120990,8 +121335,8 @@ self: { }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.4"; - sha256 = "1k5bnk1kz25zgky5rqb214gq5adkz6qi6p16gk0hvy54iyjdj9sa"; + version = "0.1.0.5"; + sha256 = "1c19x8qqrq8fiaxdz917nim8z8dcsi4bcyf88ci39d3xq1iq9iis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122206,8 +122551,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.10"; - sha256 = "0qpr04gv0zjnpigmxzls5jsx3d98cl9127z8ljy743m5j0ff5z6f"; + version = "4.5.0.12"; + sha256 = "1mm9g3vadp0fspfd7n3y7c7n1ryhwklqv31hrjm637h92a2zzn6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -123333,6 +123678,39 @@ self: { mainProgram = "hackage-cli"; }) {}; + "hackage-cli_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, http-io-streams, io-streams + , microlens, microlens-mtl, microlens-th, mtl, netrc + , optparse-applicative, pretty, process-extras, semigroups + , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time + , unordered-containers, zlib + }: + mkDerivation { + pname = "hackage-cli"; + version = "0.1.0.0"; + sha256 = "0wl2gpbcpdfmmmi99dkxy68gi3mn1aj8f2xrm5c8w1bs4sdxdzdq"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers mtl pretty + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + http-io-streams io-streams microlens microlens-mtl microlens-th mtl + netrc optparse-applicative process-extras semigroups stringsearch + tagsoup tar text time unordered-containers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal filepath tasty tasty-golden + ]; + doHaddock = false; + description = "CLI tool for Hackage"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "hackage-cli"; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -126330,6 +126708,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-hsp_7_3_7_7" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, harp, hsp + , hsx2hs, mtl, syb, text, utf8-string + }: + mkDerivation { + pname = "happstack-hsp"; + version = "7.3.7.7"; + sha256 = "1bgjy77sbrb7nmbvb98hw5w7lb6ffvbb0nb62ylg2pf9nl862khv"; + libraryHaskellDepends = [ + base bytestring happstack-server harp hsp hsx2hs mtl syb text + utf8-string + ]; + description = "Support for using HSP templates in Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-hstringtemplate" = callPackage ({ mkDerivation, base, bytestring, happstack-server, hslogger , HStringTemplate, mtl @@ -126383,6 +126778,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-jmacro_7_0_12_5" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cereal + , digest, happstack-server, jmacro, text, utf8-string + , wl-pprint-text + }: + mkDerivation { + pname = "happstack-jmacro"; + version = "7.0.12.5"; + sha256 = "1vk0674qalyhzwndpd7az4byshhxy38dh53pgma7awj2bx1n170c"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cereal digest happstack-server + jmacro text utf8-string wl-pprint-text + ]; + description = "Support for using JMacro with Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-lite" = callPackage ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { @@ -126457,7 +126870,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_8_0_1" = callPackage + "happstack-server_7_8_0_2" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -126468,8 +126881,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.8.0.1"; - sha256 = "0bxgnsd0qawbd0yllrshdxm89g1vm4znrn5jwhbs86pmh205w3xy"; + version = "7.8.0.2"; + sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -126862,8 +127275,8 @@ self: { }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.0.1"; - sha256 = "1icdk19js4kqpw7krk0jl5yqilc52w7wchkylqr5p2zlrm92wp6k"; + version = "1.0.1.0"; + sha256 = "0zmdv6d8sbd3s8wgljyml65pmvb5iz29zh27g7888k0cz9cza82w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126992,6 +127405,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "harp_0_4_3_6" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "harp"; + version = "0.4.3.6"; + sha256 = "1949mz3sm8sw3wfxcakx3anriwrkng2n5ixwqdabbw9jhib8gm0f"; + libraryHaskellDepends = [ base ]; + description = "HaRP allows pattern-matching with regular expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -127085,6 +127510,8 @@ self: { pname = "hasbolt"; version = "0.1.6.2"; sha256 = "1y7vjng3qjy5jaj3c90b5a08xrn49c4bb2wa9s612ny5qc98dl9g"; + revision = "1"; + editedCabalFile = "029sw5fqcqpzsx2ahkngfimyd9kyjn7abg0cvz4pb8y96ypl3cs7"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -127110,8 +127537,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.9"; - sha256 = "0v3vl1q25g2qac2f3l4bk9bnzqx39d11wvbqclxrif26hv24pkdy"; + version = "0.0.2.0"; + sha256 = "0cxkps6zqnp97r118ffhnvh871dl4mklqcpgxhbfwfgsjar4w2y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127333,6 +127760,50 @@ self: { broken = true; }) {}; + "hash-addressed" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , cryptohash-sha256, directory, filepath, quaalude, resourcet + , temporary, transformers + }: + mkDerivation { + pname = "hash-addressed"; + version = "0.0.1.0"; + sha256 = "1a77k38blvlzb5q5qg2wclfm0g4m7rd1fbpyqb5y64p7fjcc3gy6"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptohash-sha256 directory + filepath quaalude resourcet temporary transformers + ]; + description = "Hash-addressed file storage"; + license = lib.licenses.asl20; + }) {}; + + "hash-addressed-cli" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptohash-sha256 + , directory, filepath, hash-addressed, ini, optparse-applicative + , quaalude, resourcet, safe-exceptions, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "hash-addressed-cli"; + version = "2.0.0.0"; + sha256 = "15ddsrny16k0wqd3nx57rw05azdxq2lhbxxyklzl1gz93vcgb6i2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative quaalude resourcet + safe-exceptions text transformers unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative quaalude resourcet + safe-exceptions text transformers unordered-containers + ]; + description = "Hash-addressed file storage app"; + license = lib.licenses.asl20; + mainProgram = "hash-addressed"; + }) {}; + "hash-store" = callPackage ({ mkDerivation, base, base16-bytestring, blake2, bytestring , directory, filepath @@ -132258,6 +132729,21 @@ self: { broken = true; }) {}; + "hasql-listen-notify" = callPackage + ({ mkDerivation, base, bytestring, hasql, mtl, postgresql-libpq + , text + }: + mkDerivation { + pname = "hasql-listen-notify"; + version = "0.1.0"; + sha256 = "0bq4s4x76spjziqgda0shdzfwdhgz1fhsbdg63r3l0m01ixg1a50"; + libraryHaskellDepends = [ + base bytestring hasql mtl postgresql-libpq text + ]; + description = "LISTEN/NOTIFY with hasql"; + license = lib.licenses.bsd3; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , directory, hasql, hasql-transaction, hspec, memory, text, time @@ -138288,6 +138774,8 @@ self: { pname = "hie-compat"; version = "0.3.1.0"; sha256 = "0ixk1xf8958ajxb11gxx64sf0w6glb9n171jmdqhzdfffd1abs71"; + revision = "1"; + editedCabalFile = "1dr9cqqmxq6dwsdbmm7q4a26ghsnq66yl49wy54dpyln5xzz4234"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -140467,10 +140955,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.6.4"; - sha256 = "1719sa7zxaa5amrqhkckn9ip5wzc2qbi8gn4f3l98a7sh77f9fym"; - revision = "1"; - editedCabalFile = "050x8yfvk3vqlipirfwn9h0ckghmsp6f8l6skg70d330i868zahm"; + version = "1.6.5"; + sha256 = "0znrypimfcr4immy3x5651cfkny1n8yi8isfh72mv2px70994pm1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142341,8 +142827,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.5"; - sha256 = "1f66q9xq6da4xyl564jxixn60hs4qh4ksgdfigj4xsi44zij9gyx"; + version = "0.5.0.1"; + sha256 = "0im754fgqzi28snwf9bxkj4i1g69c0q8knzjvpmbrs79d5rncpxk"; libraryHaskellDepends = [ base comfort-array comfort-array-shape containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi @@ -144090,10 +144576,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { pname = "hopenssl"; - version = "2.2.4"; - sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; - revision = "1"; - editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf"; + version = "2.2.5"; + sha256 = "1gq3q4fl8vbdg1ha69q18qj1zx13nhkrapz0chs4s0jb29hrh3vm"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -144331,8 +144815,8 @@ self: { }: mkDerivation { pname = "horizon-gen-nix"; - version = "0.4.0"; - sha256 = "0s0macrn45wh1y7nflw9y73wxsynvym7n12f9n0yhxi8w3j7wzn2"; + version = "0.5"; + sha256 = "058m8mbrlq7jlgx1vxl1mdwb0ly7n9wwkb1jijgf5l4xil1vjmsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144352,8 +144836,8 @@ self: { }: mkDerivation { pname = "horizon-spec"; - version = "0.4.1"; - sha256 = "1xr9x626fzw8bhrkzgv3r00cjsawav76jb68yznj1jlv91cvmxac"; + version = "0.5"; + sha256 = "0ming3s98g75j20bg3dy444711k1xc9c6246wlbq4y19zx5r8lxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144847,6 +145331,46 @@ self: { mainProgram = "hpack"; }) {}; + "hpack_0_35_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.35.2"; + sha256 = "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -145077,7 +145601,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Alternative to 'directory' package with ByteString based filepaths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-filepath" = callPackage @@ -145106,7 +145629,6 @@ self: { ]; description = "High-level IO operations on files/directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-posix" = callPackage @@ -145445,7 +145967,7 @@ self: { broken = true; }) {inherit (pkgs) postgresql;}; - "hpqtypes_1_10_0_2" = callPackage + "hpqtypes_1_11_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, HUnit, libpq, lifted-base, monad-control, mtl , QuickCheck, random, resource-pool, scientific, semigroups @@ -145455,8 +145977,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.10.0.2"; - sha256 = "0rrsd16cxh8p0ssayxla99svapkbbl2sn5n9hi8vcf9hazfh8nlw"; + version = "1.11.0.0"; + sha256 = "14d01gi2bqqf5hcgaysc5m8c2s9h8bfsbg76vdvzksjz08nj5klr"; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base monad-control mtl resource-pool semigroups text text-show time @@ -145465,7 +145987,7 @@ self: { libraryPkgconfigDepends = [ libpq ]; testHaskellDepends = [ aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework + mtl QuickCheck random resource-pool scientific test-framework test-framework-hunit text text-show time transformers-base unordered-containers uuid-types vector ]; @@ -145501,8 +146023,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.2.0"; - sha256 = "0vb96dm8w089j8zc0i5k8abr7dx5nbrmlpjwhpi2vshhmmihkja3"; + version = "1.16.3.0"; + sha256 = "157971qzbxbnwg81879x9rm76slac07s72gx4l1czs6ll53pkl3d"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -145586,8 +146108,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.1.1"; - sha256 = "0r8sbi4g49r95pxmm81q291nlixj4wi4m6qrq5wkjp8yrrm2s9gb"; + version = "0.1.2"; + sha256 = "1ggi44lmfs8nny93i60b4s26ygi8qk5dk2ip5sm9mm6ysz907f73"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149002,6 +149524,29 @@ self: { mainProgram = "hsinstall"; }) {}; + "hsinstall_2_8" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Cabal, directory, exceptions + , filepath, heredoc, newtype-generics, optparse-applicative + , process, safe-exceptions, transformers + }: + mkDerivation { + pname = "hsinstall"; + version = "2.8"; + sha256 = "1nxkmdvg7fsrmsy1033l7ghmjc859mrvc6gg6pz2xknpg0rwxx3h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + ansi-wl-pprint base Cabal directory exceptions filepath heredoc + newtype-generics optparse-applicative process safe-exceptions + transformers + ]; + description = "Install Haskell software"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsinstall"; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -149290,14 +149835,12 @@ self: { ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; - version = "1.1.0"; - sha256 = "1437ff2vqhaymiabp31qhr5ixb99h93cp6qz6z82c4d9c5wvl0q6"; + version = "1.1.0.1"; + sha256 = "1gjccs0fwbxavzkm7j8nm2sw2h8rs7d5zyv1nxwkavyd73wqsqlh"; libraryHaskellDepends = [ base bytestring hslua-core ]; testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hslua-marshalling" = callPackage @@ -149433,7 +149976,6 @@ self: { ]; description = "Lua module to work with file zips"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-objectorientation" = callPackage @@ -149868,14 +150410,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_8" = callPackage + "hspec_2_10_9" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.8"; - sha256 = "13g46fk7hcnk3058pb2wwq257pi8628qaa9md9sfw5rlw878z25r"; + version = "2.10.9"; + sha256 = "0vbi07wpf7nvg2bxlp91gi7c7hkq29q8va83wawzlb0mzaxbsccl"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -149998,7 +150540,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_8" = callPackage + "hspec-core_2_10_9" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -150007,8 +150549,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.8"; - sha256 = "0bka7r8b2qh82sxnz5mcfw2swl4k2v3q97yb0n1rhs1g444lfcqn"; + version = "2.10.9"; + sha256 = "1aby2axr9pqbb75va2n1szkl6jw402kin39xv2m8i6f14fy2hzpz"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -150089,14 +150631,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_8" = callPackage + "hspec-discover_2_10_9" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.8"; - sha256 = "032s5mfr9sw2bgdi2l6fy8jdwm79nr896dw1ha16m94m8596vmph"; + version = "2.10.9"; + sha256 = "16ahgiwgj1nkp0bhyvpvz5avaimigja0gz78576066rsgf6kcygj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -151761,6 +152303,30 @@ self: { mainProgram = "hsx2hs"; }) {}; + "hsx2hs_0_14_1_11" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.11"; + sha256 = "1jpf3m7hcpl38p0a9wqpbaqffdxbqszyqisipgjwn0qmbh56jvas"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + executableHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsx2hs"; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153325,18 +153891,19 @@ self: { "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception - , HTTP, lazyio, network, network-uri, parsec, semigroups - , transformers, utility-ht + , HTTP, lazyio, network, network-uri, network-uri-flag, parsec + , semigroups, transformers, utility-ht }: mkDerivation { pname = "http-monad"; - version = "0.1.1.3"; - sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1"; + version = "0.1.1.4"; + sha256 = "00bzm1s896wdngz8clmjlfbdp4pw3xjk4sg1d2zznf4npssckm0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network - network-uri parsec semigroups transformers utility-ht + network-uri network-uri-flag parsec semigroups transformers + utility-ht ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = lib.licenses.bsd3; @@ -156997,6 +157564,8 @@ self: { pname = "hyper"; version = "0.2.1.1"; sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; + revision = "2"; + editedCabalFile = "13r3dafkn9bn8jw1cvw18cc6v6drgj91bmfkgdpfnr5sk3ad6k6n"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -157304,14 +157873,13 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.27"; - sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm"; - revision = "2"; - editedCabalFile = "168gf9ib669ji8lyd1a57xqkqmxyzi3m4r9pnmdxyfnqpnfqdv6r"; + version = "0.2.4.2"; + sha256 = "0k0pwvcsdmjr8vynz61hja35k1bpny6d3j2wppqf9jwgl031nh13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text + base binary bytestring directory filepath hscolour pretty-show + protolude text ]; executableHaskellDepends = [ base bytestring hscolour pretty-show protolude text @@ -158219,8 +158787,8 @@ self: { ({ mkDerivation, base, ghc, ghc-tcplugin-api }: mkDerivation { pname = "if-instance"; - version = "0.3.0.0"; - sha256 = "0d64h9ai0zmyzb9nnxfmr66chxbgdyy6vw2xhqybh4x7ga3ys4r9"; + version = "0.3.1.0"; + sha256 = "112f1nz684wdsmbg5srizb4j9lizrfwgdzm1fpyb5vsbj3ib0fh9"; libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; testHaskellDepends = [ base ghc ]; doHaddock = false; @@ -160987,14 +161555,14 @@ self: { license = lib.licenses.mit; }) {}; - "inspection-testing_0_5" = callPackage + "inspection-testing_0_5_0_1" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: mkDerivation { pname = "inspection-testing"; - version = "0.5"; - sha256 = "1iawvnk99c7w44qlw3sl98rrwa1krwjbzy0zsyi80ybg00abfwdh"; + version = "0.5.0.1"; + sha256 = "0zq7ickp6633y262nafi507zp0pmw8v6854sr1cncd3qqmrhnx99"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -161220,22 +161788,23 @@ self: { }) {}; "instrument" = callPackage - ({ mkDerivation, array, async, base, bytestring, cereal - , cereal-text, conduit, containers, csv-conduit, data-default - , errors, exceptions, hedis, hostname, HUnit, mtl, network, path - , path-io, QuickCheck, quickcheck-instances, retry, safe-exceptions - , safecopy, safecopy-hunit, statistics, stm, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unix, vector, zlib + ({ mkDerivation, array, async, atomic-primops, base, bytestring + , cereal, cereal-text, conduit, containers, csv-conduit + , data-default, errors, exceptions, hedis, hostname, HUnit, mtl + , network, path, path-io, QuickCheck, quickcheck-instances, retry + , safe-exceptions, safecopy, safecopy-hunit, statistics, stm, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers, unix + , vector, zlib }: mkDerivation { pname = "instrument"; - version = "0.6.0.0"; - sha256 = "12wjxd8yi4dg8ca3q96rc2pvdx83hwx5a9zx1i7picl4bm5gq7a4"; + version = "0.6.1.0"; + sha256 = "0lp759kgssp1mgz5b3na9306987fxrifahissql7w2dajg9ma0nr"; libraryHaskellDepends = [ - array base bytestring cereal cereal-text conduit containers - csv-conduit data-default errors exceptions hedis hostname mtl - network retry safe-exceptions safecopy statistics text time - transformers unix vector zlib + array atomic-primops base bytestring cereal cereal-text conduit + containers csv-conduit data-default errors exceptions hedis + hostname mtl network retry safe-exceptions safecopy statistics text + time transformers unix vector zlib ]; testHaskellDepends = [ async base bytestring cereal containers data-default hedis HUnit @@ -161260,6 +161829,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "instrument-cloudwatch" = callPackage + ({ mkDerivation, amazonka, amazonka-cloudwatch, async, base + , containers, instrument, lens, QuickCheck, retry, safe-exceptions + , semigroups, stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers + }: + mkDerivation { + pname = "instrument-cloudwatch"; + version = "0.2.1.0"; + sha256 = "1iigjf9c1n7by13q13hzxn8ciwvadxszbvsj782pf2arm3mhhvyw"; + libraryHaskellDepends = [ + amazonka amazonka-cloudwatch async base containers instrument lens + retry safe-exceptions semigroups stm stm-chans text time + transformers + ]; + testHaskellDepends = [ + base QuickCheck semigroups stm stm-chans tasty tasty-hunit + tasty-quickcheck + ]; + description = "Adds a worker for the instrument package that exports to Amazon CloudWatch"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "int-cast" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -161377,8 +161970,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "3"; - editedCabalFile = "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym"; + revision = "4"; + editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -161431,16 +162024,17 @@ self: { }) {}; "integer-types" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec }: + ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec + , hspec-hedgehog, quaalude + }: mkDerivation { pname = "integer-types"; - version = "0.0.0.0"; - sha256 = "1hny749vzc9bp0dqhypfanxnjjp6s87nmwm17xzh75742ajcf86z"; - revision = "1"; - editedCabalFile = "0c5xfvy8cspzbakng4rnnhc45n24hjrldf14i8ipp2l94n8mvn8y"; - libraryHaskellDepends = [ base deepseq exceptions hedgehog ]; - testHaskellDepends = [ base deepseq exceptions hedgehog hspec ]; - doHaddock = false; + version = "0.0.0.1"; + sha256 = "0s12gsa8k9b2pgd0705ji6qj4whl1vv0wpxjn129ppdb9dmji6gg"; + libraryHaskellDepends = [ base deepseq quaalude ]; + testHaskellDepends = [ + base deepseq exceptions hedgehog hspec hspec-hedgehog quaalude + ]; description = "Integer, Natural, and Positive"; license = lib.licenses.asl20; }) {}; @@ -161670,8 +162264,8 @@ self: { }: mkDerivation { pname = "internetmarke"; - version = "0.0.3"; - sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z"; + version = "0.0.4"; + sha256 = "19wf0mx67kz2ghkw47b0xjxq5p81hhkc6i8mi5qm565r5nq5ff5n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -164702,8 +165296,10 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.2.1"; - sha256 = "03cf6yb3nbcwy0429b0r2dxj6dvk295y4w73lyc6fpjh001yp7c9"; + version = "0.7.2.2"; + sha256 = "0f47cyhsjw57k4cgbmwvawn02v9dvx4x1pn7k2z612srf5l1igb5"; + revision = "1"; + editedCabalFile = "08y9jiyqxxpv6kjivlk2qaiidj3hayyfi7baqzsfn28bskxr7d9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167364,8 +167960,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }: mkDerivation { pname = "jsonl-conduit"; - version = "0.1.2"; - sha256 = "03ab1ysyqg0vnlx1pxw5gj1d2gq16zsz9pdrscdjp9491fiwxg2b"; + version = "0.1.3"; + sha256 = "04xrkkyazj5ss8857ckngxd366a2lbyck1y6wfwisw2xnj3yxdqj"; libraryHaskellDepends = [ aeson base bytestring conduit jsonl ]; testHaskellDepends = [ aeson base bytestring conduit hspec ]; description = "Conduit interface to JSONL-encoded data"; @@ -170133,6 +170729,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "ki"; + version = "1.0.0.2"; + sha256 = "1sxzgh8g9fahqwx7ky4f1g03fhy791hilfansx8kf39gfk646dcw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "A lightweight structured concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ki-effectful" = callPackage ({ mkDerivation, base, effectful-core, ki, stm, tasty, tasty-hunit }: @@ -170260,6 +170869,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-apply_0_4_0_0" = callPackage + ({ mkDerivation, base, first-class-families }: + mkDerivation { + pname = "kind-apply"; + version = "0.4.0.0"; + sha256 = "0bw41crzif6rdsfpskb8yanhzkcwn7hqwjawzifgi6jz3mvqqaha"; + libraryHaskellDepends = [ base first-class-families ]; + description = "Utilities to work with lists of types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kind-generics" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { @@ -170271,6 +170892,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics_0_5_0_0" = callPackage + ({ mkDerivation, base, first-class-families, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.5.0.0"; + sha256 = "0l26fx2gyh8lav28zdwx882zmg4qqrj51d8ra9zs5jidirwhi415"; + libraryHaskellDepends = [ base first-class-families kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "kind-generics-deriving" = callPackage + ({ mkDerivation, aeson, base, first-class-families, kind-apply + , kind-generics + }: + mkDerivation { + pname = "kind-generics-deriving"; + version = "0.3.0.0"; + sha256 = "03702p4kviy301vagzwybjak3kvfcxrsc22vq89ixlws7qpqakp1"; + libraryHaskellDepends = [ + aeson base first-class-families kind-apply kind-generics + ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kind-generics-th" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction @@ -170289,6 +170939,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_3_0" = callPackage + ({ mkDerivation, base, fcf-family, ghc-prim, kind-generics + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.3.0"; + sha256 = "12rqqsvfwllq0k5dmgvab61j5n92xx6z6xlcmi4sm5zfxk2pi3b5"; + libraryHaskellDepends = [ + base fcf-family ghc-prim kind-generics template-haskell + th-abstraction + ]; + testHaskellDepends = [ base kind-generics template-haskell ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170332,8 +171000,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "5"; - editedCabalFile = "0fqzr4bwiif9ifmdjxkcnky9hn5ygn8pj3gd004dc27nx6dhxzmc"; + revision = "6"; + editedCabalFile = "15fkqfhf4pjskbivsvjnrq79667cdxf3jv2yx576vl8fkgx5l1ba"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -172574,25 +173242,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, mtl, pretty, process - }: - mkDerivation { - pname = "language-c"; - version = "0.9.1"; - sha256 = "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath mtl - pretty process - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - description = "Analysis and generation of C code"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; - }) {}; - - "language-c_0_9_2" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq , directory, filepath, happy, mtl, pretty, process }: @@ -172608,7 +173257,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; @@ -173888,8 +174536,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.5"; - sha256 = "0g4nwbkb5nxfmh7aan7r94gchr3wmr45g18mzxzcxqxqpllj3vs1"; + version = "0.5.0.2"; + sha256 = "18gb8p2mx9hwhcqnqghvjhrdbxr7sziyr936vn2bnh33w9srnghi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173962,10 +174610,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.3"; - sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; - revision = "1"; - editedCabalFile = "15w2ml6iqwk7776dl9m7lg0jp7akw9f8s95flrsjfxr479qig48i"; + version = "0.1.3.1"; + sha256 = "1mf41wcbxkgiv71c3jjwhsdg9d7qpa88qsifpa5vgplpx2v1p6ya"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173984,8 +174630,8 @@ self: { }: mkDerivation { pname = "lapack-hmatrix"; - version = "0.0.0.1"; - sha256 = "0jd3sy03cxdfxakxaj1kxpc3jn0z8sd74lpxxg9s9jdvaxxxyflj"; + version = "0.0.0.2"; + sha256 = "16w7rwf1d7m3ml0zmdk2gf2ri0p9dljp67d8l6afwblzwqvlrkbd"; libraryHaskellDepends = [ base comfort-array hmatrix lapack netlib-ffi transformers utility-ht vector @@ -174019,6 +174665,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "large-generics" = callPackage @@ -174385,6 +175032,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "lattices_2_1" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , integer-logarithms, QuickCheck, quickcheck-instances + , semigroupoids, tagged, tasty, tasty-quickcheck, transformers + , universe-base, universe-reverse-instances, unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "2.1"; + sha256 = "1wxam7c00bcfl3g1aiayxzjscmmbm393gfj8zmx77ijhs7v1zp3v"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable integer-logarithms + QuickCheck semigroupoids tagged transformers universe-base + universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-base + universe-reverse-instances unordered-containers + ]; + description = "Fine-grained library for constructing and manipulating lattices"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, exceptions, extra @@ -174395,8 +175067,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.4"; - sha256 = "0ah3sxghmbv3gzzqs9xak5xi5fpzkvhgf0v637sq2w1k06776k56"; + version = "3.1.0"; + sha256 = "17jq8fccppdivd2a662aax1hf12rgldjhk2d89m285k6pdcfyyrh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -175039,8 +175711,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "ldtk-types"; - version = "0.2.0.0"; - sha256 = "0dyjzcrd5p3hg54j0qnszxdpfb7wn6gykaq8nc6il284nf9rqbai"; + version = "1.2.3"; + sha256 = "1xva58a0dsplw03sx2ip4ad88icp9mn5n5wpi81hgy9kj6szh22x"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Datatypes and Aeson instances for parsing LDtk"; @@ -177434,6 +178106,8 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -179849,24 +180523,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.5.3"; - sha256 = "0j3fgfa84f2cw87j80v5sq82s42505v82pwxgjyhbiflaxjd7wxd"; - libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = lib.licenses.mit; - }) {}; - - "list-t_1_0_5_6" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, transformers, transformers-base }: @@ -179881,7 +180537,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -180140,8 +180795,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lists-flines"; - version = "0.1.2.0"; - sha256 = "0m33az0fkry1p0653g3kyxi0y7flmlpivi02a5iz7drslikz6xbd"; + version = "0.1.3.0"; + sha256 = "015ln008c1nb9ajykn1kr91z8ab393xd59m8sgw1ih62k9g4f3f0"; + revision = "1"; + editedCabalFile = "0mb010y2p83n7cwxq35ynv35id6y1n14hfsjfgmvg1d8kax0g39k"; libraryHaskellDepends = [ base ]; description = "Additional data and structures to some 'String'-related lists"; license = lib.licenses.mit; @@ -180785,6 +181442,8 @@ self: { pname = "llvm-pkg-config"; version = "0.0.2"; sha256 = "1p4ww8ylhr4ag1dfz4sffkg2qsyjj4zxccda3nr50k3c26pmmdz1"; + revision = "1"; + editedCabalFile = "0wd3vvcas446skkmp2w3jp7f3d1cbl7b58kikwgrmlqa6ddzyzlk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -181125,23 +181784,6 @@ self: { }) {}; "loc" = callPackage - ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog - }: - mkDerivation { - pname = "loc"; - version = "0.1.4.0"; - sha256 = "1sv3nka1dxvxrvcl9jz8qa06194wvk2vcs894rzb4g052ikxgmnb"; - revision = "1"; - editedCabalFile = "015wiw9q95aqka731nyrc99m4c4h6fal92ka46rd6kcili8k7ysh"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base containers hedgehog hspec hspec-hedgehog - ]; - description = "Types representing line and column positions and ranges in text files"; - license = lib.licenses.asl20; - }) {}; - - "loc_0_1_4_1" = callPackage ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog }: mkDerivation { @@ -181154,7 +181796,6 @@ self: { ]; description = "Line and column positions and ranges in text files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "loc-test" = callPackage @@ -181942,8 +182583,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "logical-constraints"; - version = "0.1.2.0"; - sha256 = "1sj47ampdyh117wl2czbkqks6vbii2n24p374r49zqnpcw9y4862"; + version = "0.1.3.0"; + sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql"; libraryHaskellDepends = [ base ]; description = "Simple logical constraints 'syntax-sugar' writing library"; license = lib.licenses.mit; @@ -184110,8 +184751,8 @@ self: { }: mkDerivation { pname = "lzo"; - version = "0.1.1.4"; - sha256 = "1n6b2y2bmq3kl6h5mjl301r31rmvrcsc3l66jmnj3ilrj4506m1y"; + version = "0.1.1.5"; + sha256 = "1giv7ksmcgilmysdz26nmr37anvgyyddyzazx7cfwhrj6nv949w0"; libraryHaskellDepends = [ base binary bytestring digest digest-sig ]; @@ -186703,62 +187344,54 @@ self: { }) {}; "math-programming" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , QuickCheck, text, transformers }: mkDerivation { pname = "math-programming"; - version = "0.4.0"; - sha256 = "0c154gvx0h1xincmmx2jcrvaivni36ahglbrwx08v8z3wdp51k0m"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ - base containers mtl tasty tasty-discover tasty-hunit - tasty-quickcheck text + version = "0.5.1"; + sha256 = "0lp1mjl3c01xmypcix0q8pa4id1acx418mc1vlj5hrprs30smin1"; + libraryHaskellDepends = [ + base containers exceptions mtl text transformers ]; - testToolDepends = [ tasty-discover ]; + testHaskellDepends = [ base hspec mtl QuickCheck text ]; description = "A library for formulating and solving math programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "math-programming-glpk" = callPackage - ({ mkDerivation, base, containers, glpk, glpk-headers - , math-programming, math-programming-tests, mtl, tasty - , tasty-discover, tasty-hunit, text + ({ mkDerivation, base, glpk-headers, hspec, math-programming + , math-programming-tests, mtl, text, transformers, unliftio }: mkDerivation { pname = "math-programming-glpk"; - version = "0.4.1"; - sha256 = "1ikg8a3pspcrk46rr87lnwkhziihzfpjd543bisqs0pl2db1ll5b"; + version = "0.5.1"; + sha256 = "0b7r81l1gc57kxbflp4189wx4mvyxf5lf86in6vw2n76qxz04fsq"; libraryHaskellDepends = [ - base containers glpk-headers math-programming mtl text + base glpk-headers math-programming mtl text transformers unliftio ]; testHaskellDepends = [ - base containers glpk-headers math-programming - math-programming-tests mtl tasty tasty-discover tasty-hunit text + base hspec math-programming math-programming-tests unliftio ]; - testSystemDepends = [ glpk ]; - testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) glpk;}; + }) {}; "math-programming-tests" = callPackage - ({ mkDerivation, base, math-programming, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, base, containers, hspec, math-programming + , microlens, microlens-mtl, microlens-th, mtl, QuickCheck, random + , text }: mkDerivation { pname = "math-programming-tests"; - version = "0.4.0"; - sha256 = "01d6yb4zm2jky8jm8jzd1365nhjsa4c50b5a5yx3r7g078lk91pi"; + version = "0.5.1"; + sha256 = "0mfx6vs6nniprgdcpgnc2z7mpampyiqada6rsa5gkd3k8vwy6aa2"; libraryHaskellDepends = [ - base math-programming tasty tasty-hunit tasty-quickcheck text + base containers hspec math-programming microlens microlens-mtl + microlens-th mtl QuickCheck random text ]; description = "Utility functions for testing implementations of the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mathblog" = callPackage @@ -187575,8 +188208,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.0.1"; - sha256 = "02wkdjll77biimblsjkyh97c3adfm7g64bbvyz3m5v37fg75231d"; + version = "0.8.1.0"; + sha256 = "15sdqfq9sfjwkbzwi3qsjg8d59nj44qx3sh3sd9zk3hmc11k8wp4"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -189963,29 +190596,6 @@ self: { }) {}; "microstache" = callPackage - ({ mkDerivation, aeson, base, base-orphans, bytestring, containers - , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "microstache"; - version = "1.0.2.2"; - sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; - revision = "1"; - editedCabalFile = "0j9nvvyfk4grxhfg7c0nv6fp635kxnrg95zqmi2dgcw0fkw0apgr"; - libraryHaskellDepends = [ - aeson base containers deepseq directory filepath parsec text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base-orphans bytestring containers parsec tasty - tasty-hunit text - ]; - description = "Mustache templates for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "microstache_1_0_2_3" = callPackage ({ mkDerivation, aeson, base, base-orphans, bytestring, containers , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text , transformers, unordered-containers, vector @@ -190004,7 +190614,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microtimer" = callPackage @@ -190070,8 +190679,8 @@ self: { }: mkDerivation { pname = "midi"; - version = "0.2.2.3"; - sha256 = "12vj9h7vdklzn5dglypjsw1bs9rdacdg9fmxhnbd89jv89dyn4km"; + version = "0.2.2.4"; + sha256 = "14dv5ihlk5jqmvd3b0wfk4nzk4phan5gx6fmvq616mrp6dsflx58"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random semigroups @@ -191752,8 +192361,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array"; - version = "0.3.0.0"; - sha256 = "0fmdql0jrzbr7yl0axk41l5xl476is5xp38p13179nppll44a5d4"; + version = "0.3.1.1"; + sha256 = "0f0lksih0mgfk70h3ws4yh5fshmcx2s32vva2yj3x5cx4c6w94n6"; libraryHaskellDepends = [ base ]; description = "A library that can be used for multiple Ord a => a -> b transformations"; license = lib.licenses.mit; @@ -191864,6 +192473,7 @@ self: { ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn6ukra"; }) {}; @@ -191909,7 +192519,9 @@ self: { ]; description = "Modifies the amplitudes of the sounds representations created by mmsyn7ukr-array and mmsyn7ukr packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn7l"; + broken = true; }) {}; "mmsyn7s" = callPackage @@ -191965,6 +192577,8 @@ self: { ]; description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h-array, dobutokO2-array and other similar packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mmsyn7ukr-common" = callPackage @@ -192495,20 +193109,21 @@ self: { "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, fail, filepath, html, HTTP - , network, network-uri, old-locale, old-time, parsec, process - , transformers, unix, utility-ht + , network, network-bsd, network-uri, network-uri-flag, old-locale + , old-time, parsec, process, transformers, unix, utility-ht }: mkDerivation { pname = "mohws"; - version = "0.2.1.8"; - sha256 = "039abcwkqijsw8qp2iid6ilnyg79lvc1m6zik0jc4gadl5g704wh"; + version = "0.2.1.9"; + sha256 = "0a2hajnnngmarxpypbk1jvmwb8y93y2hhcnp86bj5rf3j5far5pf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory - explicit-exception fail filepath html HTTP network network-uri - old-locale old-time parsec process transformers unix utility-ht + explicit-exception fail filepath html HTTP network network-bsd + network-uri network-uri-flag old-locale old-time parsec process + transformers unix utility-ht ]; executableHaskellDepends = [ base bytestring ]; description = "Modular Haskell Web Server"; @@ -193125,6 +193740,28 @@ self: { license = lib.licenses.mit; }) {}; + "monad-logger_0_3_39" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.39"; + sha256 = "19992zh63axs0q86fgznk04dan8h3hbs72cjp1s3yynsgl23pwnk"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-logger-aeson" = callPackage ({ mkDerivation, aeson, aeson-diff, base, bytestring, context , directory, exceptions, fast-logger, hspec, hspec-discover @@ -194231,6 +194868,8 @@ self: { pname = "monadplus"; version = "1.4.3"; sha256 = "1gwy7kkcp696plfsbry22nvvqnainyv1n1van8yzskilz26k2yc5"; + revision = "1"; + editedCabalFile = "177z7d8hzl53cwxzsj0hqc1icm89d8k2faz99j790ag2vjmsai5g"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = lib.licenses.bsd3; @@ -198786,8 +199425,8 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.3"; - sha256 = "04cznws3qq9km75ssigz3cfnjkh5lldgmyy29p8vrdf4s2g8i4z1"; + version = "0.1.0.4"; + sha256 = "04hh9yydm6xkv526k5kivyimwbjic591527rl6r2c5bykmkdns38"; libraryHaskellDepends = [ base safe-exceptions ]; description = "A trivial lock based on MVar"; license = lib.licenses.asl20; @@ -199857,8 +200496,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.1.1.0"; - sha256 = "1g3xb3pr6sxn3sk9h2jbqlj30vh4nxcc14d06dawmqfva8b1gfp5"; + version = "1.1.2.0"; + sha256 = "0yzz8vb4pjb177p3z3qr4rvn8nz5bdha0w7jmq1791g0g022jvqj"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -202698,6 +203337,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-udp" = callPackage + ({ mkDerivation, base, bytestring, containers, iproute, network }: + mkDerivation { + pname = "network-udp"; + version = "0.0.0"; + sha256 = "1fj7pa9ymbbf8kvklxk44ric1kc37lwx4n3x0jcb8mm39ww6x629"; + libraryHaskellDepends = [ + base bytestring containers iproute network + ]; + description = "UDP library"; + license = lib.licenses.bsd3; + }) {}; + "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -203774,6 +204426,8 @@ self: { pname = "nix-diff"; version = "1.0.19"; sha256 = "0iscad4ydgg1365k64bzxn15pl4jnsv17jbzda4s0fs9ff4c5ias"; + revision = "1"; + editedCabalFile = "0yf5x1wx33bgpr1gj24jsgp5gx2741xjchyhvjb3acvw7w5lzr0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207319,8 +207973,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.6"; - sha256 = "1ldjswdyxckxrmypmx027aw90b93r41izqw4qj1szp6p1mjbx3pn"; + version = "1.0.7"; + sha256 = "1xg4xjc7xw22vsra0iqslclhmz37nfvqhi6qj26f3xb30ivw43j3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -207334,19 +207988,19 @@ self: { }) {}; "ogma-core" = callPackage - ({ mkDerivation, aeson, base, filepath, HUnit, IfElse, ogma-extra - , ogma-language-c, ogma-language-cocospec, ogma-language-copilot - , ogma-language-fret-cs, ogma-language-fret-reqs, ogma-language-smv - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, aeson, base, filepath, HUnit, IfElse, mtl + , ogma-extra, ogma-language-c, ogma-language-cocospec + , ogma-language-copilot, ogma-language-fret-cs + , ogma-language-fret-reqs, ogma-language-smv, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "ogma-core"; - version = "1.0.6"; - sha256 = "09svwdsn16hfa7rxf4lbpj4i08ay5rrxk6dlmic0gk7yc24mx47c"; + version = "1.0.7"; + sha256 = "04axn5mjpfgiv91c6k3753m3349cgd3s8mknvmn5lh11gpwxhjx3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base filepath IfElse ogma-extra ogma-language-c + aeson base filepath IfElse mtl ogma-extra ogma-language-c ogma-language-cocospec ogma-language-copilot ogma-language-fret-cs ogma-language-fret-reqs ogma-language-smv ]; @@ -207365,8 +208019,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.6"; - sha256 = "1wk4374k09wwxhb9ki5pcl6igw6d83bxffrdv7qf8xgm051vna2y"; + version = "1.0.7"; + sha256 = "0870ifglgb2r7c5rm6m5276bh6m5av6jxci89fdj2xba6rm9x9ag"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -207383,8 +208037,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.6"; - sha256 = "1c30gcnrhqd4jg1rsv4s8vi0lvpslc3rn8zwkffrwxhll0qv7dma"; + version = "1.0.7"; + sha256 = "1pqmgmhw4d736k8vnk02ggrcqh88k8kn2766pml5m2d4svzjddb6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207402,8 +208056,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.6"; - sha256 = "0lnqg0mls8j7k1w735ygl1gaqzy9hz0q71sabirdgqf4p446rm21"; + version = "1.0.7"; + sha256 = "1i3w465prdaw734pnbydjs1k8k4lwivhdkvzxassam961n0gdnw6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207419,8 +208073,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.6"; - sha256 = "0ffbnxbsxl3mcmnys8zhagqwlsxk7da6w2szf9p0sx7032j8j20d"; + version = "1.0.7"; + sha256 = "0fac170jnyv1yz1w4w53y13p79qb69rnvz6qkkxh7603lcajjzn8"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -207433,8 +208087,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.6"; - sha256 = "1jb2xqxnr2wp2fwijlzv3lr8a1vwarbk9sy63881v6ygk7jlyz8f"; + version = "1.0.7"; + sha256 = "1dyqnm3yqih636dzkjh2hdw6ahmrczw8bagcgxch5v4w3pnpbhsc"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -207454,8 +208108,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.6"; - sha256 = "0dlscsf9i877qjijb5ygw32igyi42s02wj7ggav4h1dy36dm0bf7"; + version = "1.0.7"; + sha256 = "0q49la3kyh02pk7xccf9msmlw90wjd0chm3pbi5mng2rw865hkq3"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -207474,8 +208128,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.6"; - sha256 = "1cyjymfil3zyji8lj607r900icj8789nq1zx0civm29mz6ryrj8a"; + version = "1.0.7"; + sha256 = "1wnyjdi7s9l0aym9a06ldjk1zkpmk1yjxikdmgm79ww5zn42rmvq"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -208301,19 +208955,21 @@ self: { }) {}; "oops" = callPackage - ({ mkDerivation, base, base-compat, doctest, doctest-discover, Glob - , hedgehog, hedgehog-quickcheck, hspec, hspec-discover - , hw-hspec-hedgehog, lens, mtl, QuickCheck, template-haskell - , transformers + ({ mkDerivation, base, base-compat, doctest, doctest-discover + , exceptions, Glob, hedgehog, hedgehog-quickcheck, hspec + , hspec-discover, hw-hspec-hedgehog, lens, mtl, QuickCheck + , template-haskell, transformers }: mkDerivation { pname = "oops"; - version = "0.1.5.0"; - sha256 = "0yb10jv01mx2czz8sb9qxr0b34wfhvvrai52c26s6q4gwybi77jb"; - libraryHaskellDepends = [ base mtl QuickCheck transformers ]; + version = "0.2.0.0"; + sha256 = "0kqgilshjd0lrabfb4yllgqk93kyyy62h7igpyz48wvz0x9mvy3d"; + libraryHaskellDepends = [ + base exceptions mtl QuickCheck transformers + ]; testHaskellDepends = [ base base-compat doctest doctest-discover Glob hedgehog - hedgehog-quickcheck hspec hw-hspec-hedgehog lens QuickCheck + hedgehog-quickcheck hspec hw-hspec-hedgehog lens mtl QuickCheck template-haskell ]; testToolDepends = [ doctest-discover hspec-discover ]; @@ -210328,26 +210984,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative - , system-filepath, text, time, transformers, transformers-compat - , void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.4.8"; - sha256 = "108sjvjqmq2rps5x7yry0j17qyq4m0gpgxnnzc1i9cjrbhnqcida"; - revision = "1"; - editedCabalFile = "0rgh8sy2w7rh5n1sz0jxcq892myplbli15snggi77dflv00ic7zd"; - libraryHaskellDepends = [ - base bytestring Only optparse-applicative system-filepath text time - transformers transformers-compat void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "optparse-generic_1_4_9" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, transformers-compat , void @@ -210365,7 +211001,6 @@ self: { executableHaskellDepends = [ base ]; description = "Auto-generate a command-line parser for your datatype"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -211042,17 +211677,17 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_5_2_0" = callPackage + "ormolu_0_5_3_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, Diff, directory, dlist, file-embed - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, QuickCheck, syb, temporary, text + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.5.2.0"; - sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; + version = "0.5.3.0"; + sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211061,12 +211696,12 @@ self: { MemoTrie mtl syb text ]; executableHaskellDepends = [ - base containers filepath ghc-lib-parser gitrev optparse-applicative - text + base containers directory filepath ghc-lib-parser + optparse-applicative text th-env ]; testHaskellDepends = [ - base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec path path-io QuickCheck temporary text + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec path path-io QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -212325,6 +212960,62 @@ self: { ]; }) {}; + "pandoc_3_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, gridtables, haddock-library + , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup + , JuicyPixels, mime-types, mtl, network, network-uri, pandoc-types + , parsec, pretty, pretty-show, process, random, safe, scientific + , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty + , tasty-bench, tasty-golden, tasty-hunit, tasty-quickcheck + , temporary, texmath, text, text-conversions, time + , unicode-collation, unicode-transforms, unix, xml, xml-conduit + , xml-types, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "3.0.1"; + sha256 = "0yxrcr589z1wbk1ng7qg6ni7zy1vm2v5fg5df639xgk1na4sn0jc"; + configureFlags = [ "-f-trypandoc" ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64 binary blaze-html + blaze-markup bytestring case-insensitive citeproc commonmark + commonmark-extensions commonmark-pandoc connection containers + data-default deepseq directory doclayout doctemplates emojis + exceptions file-embed filepath Glob gridtables haddock-library + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mime-types mtl network network-uri pandoc-types parsec + pretty pretty-show process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-collation unicode-transforms unix xml + xml-conduit xml-types yaml zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates filepath + Glob mtl pandoc-types process tasty tasty-golden tasty-hunit + tasty-quickcheck text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq mtl tasty-bench text + ]; + doHaddock = false; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -212381,6 +213072,26 @@ self: { mainProgram = "pandoc-citeproc-preamble"; }) {}; + "pandoc-cli" = callPackage + ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine + , pandoc-server, safe, text, wai-extra, warp + }: + mkDerivation { + pname = "pandoc-cli"; + version = "0.1"; + sha256 = "01fb51nbx6ljv7jkmny3bxlgkg307radr5n6d4m0rg7wxigsrmn5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslua-cli pandoc pandoc-lua-engine pandoc-server safe text + wai-extra warp + ]; + description = "Conversion between documentation formats"; + license = lib.licenses.gpl2Plus; + mainProgram = "pandoc"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl @@ -212414,6 +213125,46 @@ self: { description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "pandoc-crossref_0_3_15_0" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-mtl + , microlens-th, mtl, open-browser, optparse-applicative, pandoc + , pandoc-cli, pandoc-types, syb, template-haskell, temporary, text + , utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.15.0"; + sha256 = "0kzxdpqkhm09vizsyb7ck0mnic32kci8plqlbsawdjkg4knvdn5r"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-default directory filepath microlens + microlens-mtl microlens-th mtl pandoc pandoc-types syb + template-haskell text utility-ht + ]; + executableHaskellDepends = [ + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text + ]; + testHaskellDepends = [ + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text + ]; + testToolDepends = [ pandoc-cli ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "pandoc-csv2table" = callPackage @@ -212637,6 +213388,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-lua-engine" = callPackage + ({ mkDerivation, base, bytestring, citeproc, containers + , data-default, directory, doclayout, doctemplates, exceptions + , filepath, hslua, hslua-aeson, hslua-core, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, lpeg, mtl, pandoc + , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , tasty-golden, tasty-hunit, tasty-lua, text + }: + mkDerivation { + pname = "pandoc-lua-engine"; + version = "0.1"; + sha256 = "08r7zfv8jpxscypdd814rirghmpxgh5a2wwv6bwl3ifhrxlrn4dq"; + libraryHaskellDepends = [ + base bytestring citeproc containers data-default doclayout + doctemplates exceptions hslua hslua-aeson hslua-core + hslua-module-doclayout hslua-module-path hslua-module-system + hslua-module-text hslua-module-version hslua-module-zip lpeg mtl + pandoc pandoc-lua-marshal pandoc-types parsec SHA text + ]; + testHaskellDepends = [ + base bytestring data-default directory exceptions filepath hslua + pandoc pandoc-types tasty tasty-golden tasty-hunit tasty-lua text + ]; + description = "Lua engine to power custom pandoc conversions"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pandoc-lua-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hslua , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty @@ -212659,6 +213440,29 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , hslua-list, hslua-marshalling, lua, pandoc-types, QuickCheck + , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.2.0"; + sha256 = "1sha2yxvwy31s4i1qhkk1jig37pbw5j5bxkfkwvvq0y52pl14j0g"; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types safe text + ]; + testHaskellDepends = [ + base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types QuickCheck safe tasty + tasty-hunit tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -212772,6 +213576,42 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_6_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default, directory, filepath, gitrev, hashable + , hspec-expectations, lifted-async, lifted-base, mtl + , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup + , tasty, tasty-hspec, tasty-hunit, template-haskell, text + , typed-process, unix, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "1.6.1"; + sha256 = "02ryb5bcdwli8fliwm7kngka4010a21wzz9ak8lgszgqm9d58li3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable lifted-async lifted-base mtl pandoc pandoc-types + shakespeare tagsoup template-haskell text typed-process unix yaml + ]; + executableHaskellDepends = [ + base containers directory filepath gitrev optparse-applicative + pandoc pandoc-types template-haskell text typed-process + ]; + testHaskellDepends = [ + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base criterion pandoc-types template-haskell text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -212805,6 +213645,26 @@ self: { broken = true; }) {}; + "pandoc-server" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, containers + , data-default, doctemplates, pandoc, pandoc-types, servant-server + , skylighting, text, unicode-collation, wai, wai-cors + }: + mkDerivation { + pname = "pandoc-server"; + version = "0.1"; + sha256 = "1l0nvzq4p06lsn3q5krkddgl9qf5lv7s8siqhpvnz8gjzdnxi12q"; + libraryHaskellDepends = [ + aeson base base64 bytestring containers data-default doctemplates + pandoc pandoc-types servant-server skylighting text + unicode-collation wai wai-cors + ]; + description = "Pandoc document conversion as an HTTP servant-server"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pandoc-sidenote" = callPackage ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { @@ -212826,8 +213686,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.4.0"; - sha256 = "0j25frcafcr0jvk3dfrmxan2q95920wy6jm0fahwf20f4jbanzfc"; + version = "0.3.0.0"; + sha256 = "1r7i22d4jkhd11srzxbchl9bx337800pliyvwa59i9n6hhqkycvg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -212838,6 +213698,33 @@ self: { mainProgram = "styleFromMeta"; }) {}; + "pandoc-symreg" = callPackage + ({ mkDerivation, attoparsec, attoparsec-expr, base, bytestring, mtl + , optparse-applicative, srtree + }: + mkDerivation { + pname = "pandoc-symreg"; + version = "0.1.0.1"; + sha256 = "0lw82q4mygcnwfasiz3gps1y1i5cn80q7ch2g6xshjyxrbqq3qnf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + executableHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + testHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + description = "A tool to convert symbolic regression expressions into different formats"; + license = lib.licenses.gpl3Only; + mainProgram = "pandoc-symreg"; + }) {}; + "pandoc-throw" = callPackage ({ mkDerivation, base, exceptions, pandoc }: mkDerivation { @@ -212872,6 +213759,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-types_1_23" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.23"; + sha256 = "0b8na6516rkwx3b7la58zwpmjia7hvljswzw0nds7h0r090j2rsy"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -214916,20 +215827,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.6.0.0"; - sha256 = "1fn8b8q99m6xdgiqi2smffk4s1h3sil2v5c1na8fl3gv04kc0v13"; - revision = "1"; - editedCabalFile = "0glacw02msrhc6yjbn6aaa06ixkby0fdcb1gk8lr47pdnhb4g8w0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; - description = "A partial binary associative operator"; - license = lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_6_0_1" = callPackage ({ mkDerivation, base, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -214939,7 +215836,6 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "A partial binary associative operator"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -215551,21 +216447,6 @@ self: { }) {}; "path-text-utf8" = callPackage - ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: - mkDerivation { - pname = "path-text-utf8"; - version = "0.0.1.10"; - sha256 = "1nbmsydpg8m09q5i907bnh57x5lcd3rw3rnxa31b93xzaynxwhsn"; - revision = "1"; - editedCabalFile = "1f1y2m1qqdxnqi1n4bvgbqilsjk3sqkvi4nk2pz5l9bl97k0l42z"; - libraryHaskellDepends = [ - base bytestring path safe-exceptions text - ]; - description = "Read and write UTF-8 text files"; - license = lib.licenses.asl20; - }) {}; - - "path-text-utf8_0_0_1_11" = callPackage ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; @@ -215576,7 +216457,6 @@ self: { ]; description = "Read and write UTF-8 text files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "path-tree" = callPackage @@ -215711,8 +216591,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "0.1.0.1"; - sha256 = "1mdl9r8kga6n7v7yvds46j0y8mg59h1irw8fbwqzzj142va9q8xc"; + version = "1.0.0.0"; + sha256 = "1zlnfj8a4ijxjzqvp07fsnm40wdgpcjnqb1cn8nczhl7r1d0kil6"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers exceptions http-client http-types network-uri text time uuid @@ -217749,6 +218629,50 @@ self: { broken = true; }) {}; + "persistent-event-source" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-event-source"; + version = "0.1.0"; + sha256 = "1pk0655hv6rvkk9rfdnc03fy90q16yn53yfv83rc1vrxghs17mnr"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "persistent-eventsource" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-eventsource"; + version = "0.2.0"; + sha256 = "0fp23hxg217zbm3ak85rixd06dipscgsl2ldiyhp09f2jxkskslv"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-generic" = callPackage ({ mkDerivation, base, persistent, text }: mkDerivation { @@ -217898,6 +218822,8 @@ self: { pname = "persistent-mtl"; version = "0.5.0.1"; sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; + revision = "1"; + editedCabalFile = "1qhazc2jqrhz6bkhn55nsikgf8kdvajb2ai6826nwrq657glzqa4"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -217936,6 +218862,33 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_13_1_4" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.13.1.4"; + sha256 = "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers fast-logger hspec + http-api-data HUnit monad-logger mysql path-pieces persistent + persistent-qq persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -218058,6 +219011,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_5_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vault, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.5.1"; + sha256 = "1snvzm01qgyiz3y12pzyy4phxwqpr7c47fi395w3cnl915y9i8rp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core vault + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-postgresql-streaming" = callPackage ({ mkDerivation, base, conduit, monad-logger, mtl, persistent , persistent-postgresql, postgresql-simple, resourcet, text @@ -218261,6 +219248,39 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_13_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.13.1.1"; + sha256 = "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + mtl persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-stm" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , extra, filelock, filepath, focus, hspec, stm, stm-containers @@ -218567,8 +219587,8 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.4.1"; - sha256 = "0fr0lzr7l31ai134c87jgqabw619ggj478ynq9mp1fq37hd11rbp"; + version = "0.0.4.2"; + sha256 = "0rdmdrch9q4sz23svsr52ymkllvfxi6kgc7mrfr0zdarah2sc8ip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219128,6 +220148,8 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-examples" = callPackage @@ -219173,6 +220195,8 @@ self: { libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-general" = callPackage @@ -219213,6 +220237,8 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-phonetics-basics" = callPackage @@ -219233,7 +220259,9 @@ self: { ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pldPL"; + broken = true; }) {}; "phonetic-languages-plus" = callPackage @@ -219256,7 +220284,9 @@ self: { ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "distributionTextG"; + broken = true; }) {}; "phonetic-languages-properties" = callPackage @@ -219302,6 +220332,7 @@ self: { ]; description = "A basics of the phonetic-languages functionality that can be groupped"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-common" = callPackage @@ -219368,6 +220399,7 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage @@ -219386,6 +220418,7 @@ self: { ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -219417,6 +220450,7 @@ self: { ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-common" = callPackage @@ -219433,6 +220467,7 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -219450,6 +220485,7 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -219506,6 +220542,7 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-common" = callPackage @@ -219608,7 +220645,9 @@ self: { executableHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "unconcatUkr"; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -223533,8 +224572,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "5"; - editedCabalFile = "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc"; + revision = "6"; + editedCabalFile = "0xrmzz7p2akgdyr7gm54yvq83lm9qixcrk72ia2w9xcs2r4b76vz"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -226969,14 +228008,12 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.0.1.0"; - sha256 = "1n27ylk5yzvvl6isykw0hjarnzwx652fc0xy6qzfdj0swy0bgiw7"; - revision = "2"; - editedCabalFile = "1yp173nnsk875wvqqnr9ifkvj8k7zcjbgvzpkyc0sxkq3nlrjs9q"; + version = "0.0.2.0"; + sha256 = "1z9l8a45shvv1z8zsp4d1c0nrp7zblma8g0alhp2flp7wxfv7qf3"; libraryHaskellDepends = [ aeson base constraints containers lens template-haskell text ]; - testHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base lens ]; description = "A first class record field library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -227990,6 +229027,8 @@ self: { pname = "prettyprinter-combinators"; version = "0.1.1"; sha256 = "1m6338w6cd7fsib00zs8dk16b4mxfa1vswg5bmkzafas1db6qbcg"; + revision = "3"; + editedCabalFile = "0kvfw63g2a6mn4sk3lf8i7g469gz5xazlniivbxxan91gcg7rfb2"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector @@ -227998,6 +229037,24 @@ self: { license = lib.licenses.asl20; }) {}; + "prettyprinter-combinators_0_1_1_1" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, dlist + , pretty-show, prettyprinter, syb, template-haskell, text + , unordered-containers, vector + }: + mkDerivation { + pname = "prettyprinter-combinators"; + version = "0.1.1.1"; + sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; + libraryHaskellDepends = [ + base bimap bytestring containers dlist pretty-show prettyprinter + syb template-haskell text unordered-containers vector + ]; + description = "Some useful combinators for the prettyprinter package"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -228355,6 +229412,8 @@ self: { pname = "primitive"; version = "0.7.4.0"; sha256 = "1mddh42i6xg02z315c4lg3zsxlr3wziwnpzh2nhzdcifh716sbav"; + revision = "1"; + editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -230008,8 +231067,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.29"; - sha256 = "16nj96rhkfl5h9prqsfr8n1i20vcqlpfz8plbp2vsfha8kzsi2wl"; + version = "0.0.0.30"; + sha256 = "1jcfr6mw5rkcr0vfs53szymwkkdr5jxy8ph9n8cfrn56yqhcdvqj"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -230467,8 +231526,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.3"; - sha256 = "12572f2pwn3akzwqi83p734jabrfinr7bb89yhinl8pari7lya7k"; + version = "0.9.4"; + sha256 = "1vgrwx36liqkshrfqkrb38nsbq84a6fbnmn0p2v0y76iccd2shid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -232223,6 +233282,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "purescript-bridge_0_15_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.15.0.0"; + sha256 = "09bjlmwq3vsprngsrvx3g1ah9n60bng91kfswv61lh1bhca0q9z0"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -233407,6 +234487,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.qt5) qtbase;}; + "quaalude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "quaalude"; + version = "0.0.0.1"; + sha256 = "0wwsrpm2s7gs2c4fwh4qvhnjywxfyf94dw715bz34q7bzyyk3lc6"; + libraryHaskellDepends = [ base ]; + description = "Extremely minimal prelude"; + license = lib.licenses.asl20; + }) {}; + "quack" = callPackage ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }: mkDerivation { @@ -233537,8 +234628,8 @@ self: { ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: mkDerivation { pname = "quantizer"; - version = "0.1.0.0"; - sha256 = "0pall4g5fd8flv7b380y7qqnh630jbnf5kbzxhpx13qr287casrh"; + version = "0.2.1.1"; + sha256 = "073sz728am6sj9zj2n2pnzvn5asvnj8lqcb8hbi09qp36w4mgvy4"; libraryHaskellDepends = [ base subG uniqueness-periods-vector-stats ]; @@ -237399,6 +238490,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "reactive-banana_1_3_2_0" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, pqueue + , QuickCheck, random, semigroups, stm, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, these, transformers + , unordered-containers, vault + }: + mkDerivation { + pname = "reactive-banana"; + version = "1.3.2.0"; + sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; + libraryHaskellDepends = [ + base containers deepseq hashable pqueue semigroups stm these + transformers unordered-containers vault + ]; + testHaskellDepends = [ + base containers deepseq hashable pqueue QuickCheck semigroups tasty + tasty-hunit tasty-quickcheck these transformers + unordered-containers vault + ]; + benchmarkHaskellDepends = [ + base containers QuickCheck random tasty tasty-bench + tasty-quickcheck + ]; + description = "Library for functional reactive programming (FRP)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reactive-banana-automation" = callPackage ({ mkDerivation, base, doctest, reactive-banana, stm, time , transformers @@ -237580,8 +238699,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.4.1.1"; - sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr"; + version = "0.4.1.2"; + sha256 = "1ckm95dr3y14bh73nxapm9rl39bz1lpxmclgcnd9n2mkn0b1q54w"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -239977,8 +241096,8 @@ self: { }: mkDerivation { pname = "reflex-test-host"; - version = "0.1.2.1"; - sha256 = "0hpvpf0628rc43cnh7k0b0adjb13cw9d8ykhhk0x4n2p7i9cp2zi"; + version = "0.1.2.2"; + sha256 = "1km340p317yscwjmx20pazraczsilb6mna5ka9mx7al7864jcyk1"; libraryHaskellDepends = [ base dependent-sum lens mtl primitive ref-tf reflex these transformers @@ -240090,6 +241209,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "reform-happstack_0_2_5_6" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, mtl, random + , reform, text, utf8-string + }: + mkDerivation { + pname = "reform-happstack"; + version = "0.2.5.6"; + sha256 = "1v76z620b0iw3j2cr7mjs13jcf2lk800ilnl2k46jixc4zk75biy"; + libraryHaskellDepends = [ + base bytestring happstack-server mtl random reform text utf8-string + ]; + description = "Happstack support for reform"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reform-hsp" = callPackage ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { @@ -241341,12 +242476,17 @@ self: { }) {}; "regression-simple" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, ad, base, deepseq, math-functions, splitmix + , statistics, tasty, tasty-hunit + }: mkDerivation { pname = "regression-simple"; - version = "0.1.1"; - sha256 = "18gq05xrkkxg2zrnkx9z7n91g8lagz6j3cfw7mqik7dyc2m1w675"; - libraryHaskellDepends = [ base vector ]; + version = "0.2"; + sha256 = "15axsj9zfllyc98dpvxm7mr1vq2jxj5g7a8lkpbr24fxn3avd708"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + ad base math-functions splitmix statistics tasty tasty-hunit + ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; }) {}; @@ -241535,6 +242675,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "rel8_1_4_1_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , case-insensitive, comonad, containers, contravariant, hasql + , hasql-transaction, hedgehog, mmorph, opaleye, pretty + , product-profunctors, profunctors, scientific, semialign + , semigroupoids, tasty, tasty-hedgehog, text, these, time + , tmp-postgres, transformers, uuid + }: + mkDerivation { + pname = "rel8"; + version = "1.4.1.0"; + sha256 = "0590pjiphpknxnc3g4y3f3rf134q9z5nbwrrbq81r1gx4nxb8d6n"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring case-insensitive comonad + contravariant hasql opaleye pretty product-profunctors profunctors + scientific semialign semigroupoids text these time uuid + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hasql hasql-transaction + hedgehog mmorph scientific tasty tasty-hedgehog text time + tmp-postgres transformers uuid + ]; + description = "Hey! Hey! Can u rel8?"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "relacion" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -242879,8 +244047,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.2"; - sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; + version = "0.2.2.3"; + sha256 = "1nwdvjvhd2msv6lzapdg1nkasp7wvc75mdg82ixqhwh8h7sgqs5p"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -243254,13 +244422,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "resource-pool_0_3_1_0" = callPackage - ({ mkDerivation, base, primitive, time }: + "resource-pool_0_4_0_0" = callPackage + ({ mkDerivation, base, hashable, primitive, time }: mkDerivation { pname = "resource-pool"; - version = "0.3.1.0"; - sha256 = "0klcyl0x15a0h73sn6176ma87cgb4n8g2szz54b5xzr60pws057y"; - libraryHaskellDepends = [ base primitive time ]; + version = "0.4.0.0"; + sha256 = "1cg99a88zlaxxb1aqjv8f2xip7wr6a8k0mwiyxjqsy3m7qz7h3cc"; + libraryHaskellDepends = [ base hashable primitive time ]; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -243754,8 +244922,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.5.2"; - sha256 = "1lsqjqib4nvxacsjlr4207vwwxdd86wxxjvxw4vqra6a5clj6g08"; + version = "0.2.0.0"; + sha256 = "16cymbh678qh0r237kffqmxjwgja8aryf4j8xj9z2nz40flklbca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246911,6 +248079,24 @@ self: { broken = true; }) {}; + "rpmostree-update" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , xdg-basedir + }: + mkDerivation { + pname = "rpmostree-update"; + version = "0.1.0"; + sha256 = "073mn1yzczz73vyivwsvbdbxb2q15i2li5v22d5y8jimsc59b232"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd xdg-basedir + ]; + description = "rpm-ostree update wrapper that caches change info"; + license = lib.licenses.bsd3; + mainProgram = "rpmostree-update"; + }) {}; + "rrb-vector" = callPackage ({ mkDerivation, base, deepseq, indexed-traversable, primitive , tasty, tasty-bench, tasty-quickcheck @@ -249411,8 +250597,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.0.2.0"; - sha256 = "041qjk1giqrsfis410r491c3b2s36ngsk64ihzpjb788xbr86adx"; + version = "1.1.0.0"; + sha256 = "0xaw4x4v1ir88by5dsffdxb8rdy06czq6amlxkj2wix871hyvm5j"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; @@ -249447,7 +250633,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_10_0" = callPackage + "sbp_4_11_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249456,8 +250642,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.10.0"; - sha256 = "1mhnqiqi6yv3mn0rcwiq5k79a2zxcpqp4284ziqrcjwnhjxd2cnf"; + version = "4.11.0"; + sha256 = "0flwy85dvdmaqpl8b652as8zhdypq0a513v1pvp0hrnp1z0ylg1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249556,7 +250742,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_9_1" = callPackage + "sbv_9_2" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -249565,8 +250751,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "9.1"; - sha256 = "0wkpx73blwg629l4y9vjjlhbk4qa1zzddc4z8qvida62qwcdxw6w"; + version = "9.2"; + sha256 = "0qmjdklrjcvyfkqbwafs79arjg46icnsbq018j0c6aqzhl94zknf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -249587,6 +250773,22 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv-program" = callPackage + ({ mkDerivation, base, bifunctors, containers, pretty-simple, sbv + }: + mkDerivation { + pname = "sbv-program"; + version = "1.1.0.0"; + sha256 = "0bdddln73f27zy4a8j51n82wqpcsziagzviv3vfsq7s990dmkb2g"; + libraryHaskellDepends = [ + base bifunctors containers pretty-simple sbv + ]; + testHaskellDepends = [ base sbv ]; + description = "Component-based program synthesis using SBV"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -249594,8 +250796,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.2.2"; - sha256 = "0cv2f6n32m8xaii5dpk3kz6wclxgmri1zfh09dq23s91l5asrp1v"; + version = "9.4.4"; + sha256 = "0ibz3drbr6x4mx5253gwg2gmfvf6933x8nazlg3hf8f6zwmhcm4f"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -254668,23 +255870,24 @@ self: { }) {}; "servant-hmac-auth" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring + ({ mkDerivation, base, base64-bytestring, bytestring , case-insensitive, containers, cryptonite, filepath, hspec , hspec-discover, hspec-golden, http-client, http-types, memory , mtl, servant, servant-client, servant-client-core, servant-server - , text, transformers, wai + , text, transformers, wai, warp }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.4"; - sha256 = "0nnmwqqdc7yzbd96bfmgcidz41knzrbh082dcwg2n3w0vvp0m98i"; + version = "0.1.5"; + sha256 = "1vpa699lrx20309z0brqlbiqn1mwjjqgb5k5nwxgqm67p8k3y0sx"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring case-insensitive - containers cryptonite http-client http-types memory mtl servant - servant-client servant-client-core servant-server transformers wai + base base64-bytestring bytestring case-insensitive containers + cryptonite http-client http-types memory mtl servant servant-client + servant-client-core servant-server transformers wai ]; testHaskellDepends = [ - base case-insensitive filepath hspec hspec-golden http-types text + base case-insensitive filepath hspec hspec-golden http-client + http-types servant-client servant-server text warp ]; testToolDepends = [ hspec-discover ]; description = "Servant authentication with HMAC"; @@ -254919,6 +256122,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-lucid_0_9_0_6" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.9.0.6"; + sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; + libraryHaskellDepends = [ base http-media lucid servant text ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + description = "Servant support for lucid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-machines" = callPackage ({ mkDerivation, base, base-compat, bytestring, http-client , http-media, machines, mtl, servant, servant-client @@ -255679,20 +256897,52 @@ self: { }) {}; "servant-serf" = callPackage - ({ mkDerivation, base, Cabal, directory, exceptions, filepath }: + ({ mkDerivation, base, Cabal-syntax, directory, exceptions + , filepath + }: mkDerivation { pname = "servant-serf"; - version = "0.3.1.2"; - sha256 = "12qyg3bj4f8y4f3z0p3dxh4ms8xdv6226120xsdd6jkbxynmap01"; + version = "0.3.1.3"; + sha256 = "0zlfy0xc4ssy7s68i6hddlkz41fa95490yhg19m1lvkqvc6mac2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal directory exceptions filepath + base Cabal-syntax directory exceptions filepath ]; executableHaskellDepends = [ base ]; description = "Automatically generate Servant API modules"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-serf"; + broken = true; + }) {}; + + "servant-serialization" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal, doctest + , flat, http-api-data, http-client, http-media, persist, QuickCheck + , serialise, servant, servant-client, servant-server, text, warp + }: + mkDerivation { + pname = "servant-serialization"; + version = "0.2.0"; + sha256 = "159vbiifpjn86vid0r88sgrm639pqaqzyvxmv1yssx6pr7yw3xb6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal flat http-media persist serialise + servant text + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal flat http-api-data http-client + http-media persist QuickCheck serialise servant servant-client + servant-server text warp + ]; + testHaskellDepends = [ + base binary bytestring cereal doctest flat http-media persist + QuickCheck serialise servant text + ]; + license = lib.licenses.mit; + mainProgram = "example"; }) {}; "servant-server" = callPackage @@ -255709,6 +256959,8 @@ self: { pname = "servant-server"; version = "0.19.2"; sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; + revision = "1"; + editedCabalFile = "0qlc6bg31abfhdgwalmb89bkrdsxv21rcb2gdli85xy1jvcs4z7v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255977,6 +257229,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "servant-streamly-example"; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -257595,6 +258848,8 @@ self: { pname = "shake"; version = "0.19.7"; sha256 = "1lcr6q53qwm308bny6gfawcjhxsmalqi3dnwckam02zp2apmcaim"; + revision = "1"; + editedCabalFile = "1hz57kw5pp5cpbicbi7x8sz8c6qy58dzyiljz9b9f2r1rr683d9w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -258657,6 +259912,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "shelly_1_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.11.0"; + sha256 = "0vmi8qbp1w9ir25k2p05p4jx9r7v67kkyygygl660ji6l6a89h50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-contrib HUnit + lifted-async mtl text transformers unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -259544,8 +260825,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "signed-multiset"; - version = "0.4"; - sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747"; + version = "0.5"; + sha256 = "0ajpy07n57x8gbnxym1fdmwhwzyk2a5cxvhc3hjjn3lpn50hiicl"; libraryHaskellDepends = [ base containers ]; description = "Multisets with negative membership"; license = lib.licenses.bsd3; @@ -261859,8 +263140,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.6"; - sha256 = "1hxz51vx1a1p0v8sajv2ch6y261lm4s9z5fvp5w86qygsd1zy2px"; + version = "1.0.7"; + sha256 = "02yyiplcdjad3dzcv7x4npj5h93q756ck892kdhzdrm9qbr96z66"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -262667,8 +263948,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.7.0.1"; - sha256 = "1l46xpilja815zsj96lhginl4x8jg9skxb0pvny3h12972s1k89d"; + version = "0.7.1.0"; + sha256 = "1g69ybqfhsl74n516dzby2dswp5z4qr9xhc1fcxh9j6ynan1vcmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263753,6 +265034,7 @@ self: { description = "blaze-html-clay integration for Snap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-configuration-utilities" = callPackage @@ -266182,14 +267464,14 @@ self: { }: mkDerivation { pname = "sox"; - version = "0.2.3.1"; - sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh"; + version = "0.2.3.2"; + sha256 = "1ys6xm08gr3pvyrial2z1b3gvyd44b9510dpp4ifxqf882igkjgb"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame semigroups transformers unix utility-ht ]; description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; + license = lib.licenses.gpl3Only; }) {}; "soxlib" = callPackage @@ -266199,8 +267481,8 @@ self: { }: mkDerivation { pname = "soxlib"; - version = "0.0.3.1"; - sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd"; + version = "0.0.3.2"; + sha256 = "12pkalrwqcgz77wv948mkjldc57pj090rkrjw6k3xzqvsgvnrrpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267458,8 +268740,8 @@ self: { pname = "splitmix"; version = "0.1.0.4"; sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "1"; - editedCabalFile = "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"; + revision = "2"; + editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -267619,8 +268901,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.8"; - sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4"; + version = "0.1.3.9"; + sha256 = "10sdywp24c0prvgkdndimc6jnkalzbsbdb1dxw6cv86xxphk65in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268028,15 +269310,15 @@ self: { }) {}; "sqlite-simple-interpolate" = callPackage - ({ mkDerivation, base, haskell-src-meta, mtl, parsec, sqlite-simple + ({ mkDerivation, base, custom-interpolation, sqlite-simple , template-haskell }: mkDerivation { pname = "sqlite-simple-interpolate"; - version = "0.1.1"; - sha256 = "1vi43mm6lwdpsq0r2gs7nsrn4g88r3q4d8g5gmm7al8ziz9c39vq"; + version = "0.2.0.0"; + sha256 = "1wf68a6jia64grxl590zzpq5xj33k4n20jly0dpqj17brbqwv8fa"; libraryHaskellDepends = [ - base haskell-src-meta mtl parsec sqlite-simple template-haskell + base custom-interpolation sqlite-simple template-haskell ]; testHaskellDepends = [ base sqlite-simple ]; description = "Interpolated SQLite queries via quasiquotation"; @@ -268238,6 +269520,8 @@ self: { pname = "sr-extra"; version = "1.88"; sha256 = "1cpigfdpgcy3bpp51snza0wwd88ky04hwqlzbmvmwkwznd7wqxrb"; + revision = "1"; + editedCabalFile = "0lak0dd0p2c8qf870q4ahz9qjnjak7nfaswf69lrnc3yls1s7618"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -268360,6 +269644,18 @@ self: { license = lib.licenses.mit; }) {}; + "srtree" = callPackage + ({ mkDerivation, base, containers, mtl, random, vector }: + mkDerivation { + pname = "srtree"; + version = "0.1.2.1"; + sha256 = "1laybjb57vq50bkk2mqllxwygxg7i04ng2czm8vwy18577psbz11"; + libraryHaskellDepends = [ base containers mtl random vector ]; + testHaskellDepends = [ base containers mtl random vector ]; + description = "A general framework to work with Symbolic Regression expression trees"; + license = lib.licenses.bsd3; + }) {}; + "srv" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , raw-strings-qq, wai, wai-app-static, warp, warp-tls, yaml @@ -269736,8 +271032,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.3.0.0"; - sha256 = "1a97xkbvcvr7r85b4xrzdijap3zw02j0rqxix3ld9ns907mkdq2n"; + version = "1.3.0.1"; + sha256 = "09328aw0bxps541nkb5h9r2v7lsqnsv2wv27r693r8a9fw9lsqxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269745,8 +271041,8 @@ self: { amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo bytestring cfn-flip conduit containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl - optparse-applicative resourcet rio semigroups text time unliftio - unliftio-core unordered-containers uuid yaml + optparse-applicative QuickCheck resourcet rio semigroups text time + unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -270954,8 +272250,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.2"; - sha256 = "0h81amww5caa8950nn124sn5804vdsvxz2nahwvx88hbgsgldpkg"; + version = "0.3.0.0"; + sha256 = "03cwrb4fd62mi16g11lf06hjkwk529nh016z5vlvq9jbaxalv873"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -271193,8 +272489,8 @@ self: { }: mkDerivation { pname = "stm-queue"; - version = "0.1.2.2"; - sha256 = "03mchkc1bvafh4674zyv5zxbrdwb20xvzn85wq8xkbs3z2gw9mi3"; + version = "0.2.0.0"; + sha256 = "0g4w5wv1wmhg2sj6pyq5bd0fi1b7zf99f1z0sjl3l8q0jwks16cy"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ async base hspec stm ]; benchmarkHaskellDepends = [ @@ -271484,6 +272780,8 @@ self: { pname = "storable-record"; version = "0.0.6"; sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; + revision = "1"; + editedCabalFile = "0gmyc50r9nzfwr5iyiixascgkv2lvk7xccvimqv2ix4zyi2fwdad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272561,8 +273859,7 @@ self: { ]; description = "Library for streamly and bytestring interoperation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "streamly-cassava" = callPackage @@ -272690,7 +273987,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Posix related streaming APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streamly-process" = callPackage @@ -273305,6 +274601,7 @@ self: { ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "string-isos" = callPackage @@ -273440,8 +274737,8 @@ self: { }: mkDerivation { pname = "string-variants"; - version = "0.2.0.0"; - sha256 = "0rzxvqv6waggspqbph4n0q249v0h615965rqlbbhv8a3p87kmdcd"; + version = "0.2.1.0"; + sha256 = "06dgb0f9l05jb2m51n285rnhw9s3r61m7z7mmzbd1a078cs30ndf"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text @@ -273978,6 +275275,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structs_0_1_7" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "structs"; + version = "0.1.7"; + sha256 = "072gbzxh0cnrdmbwmksqfrdvv7xhsamjrmgd6vya17md76mqndab"; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell th-abstraction + ]; + testHaskellDepends = [ + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -274461,8 +275778,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "subG"; - version = "0.5.3.0"; - sha256 = "0bq49g3ippsjiqm1qvd3y9a4fyngzw8f3my8n1amgyzxb6fk5q7w"; + version = "0.6.1.0"; + sha256 = "0y2hxb6rvzmyb8863wv7v4x3pai2fw8w968rzlgfrjh8vk1cw23r"; libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; license = lib.licenses.mit; @@ -275376,6 +276693,8 @@ self: { pname = "supply-chain"; version = "0.0.0.1"; sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; + revision = "1"; + editedCabalFile = "1nnc5k8fp5bd5na9sd9qk5cbra2zjjmddxcn4qs1ahw4lxfy9gxx"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; @@ -275393,6 +276712,25 @@ self: { license = lib.licenses.asl20; }) {}; + "supply-next" = callPackage + ({ mkDerivation, base, containers, gambler, hspec, integer-types + , quaalude, supply-chain, transformers + }: + mkDerivation { + pname = "supply-next"; + version = "0.0.1.1"; + sha256 = "0xvihbw7732w6n8qrfhdb78d8n206v5yd3ap26dcvwja58s7w7y1"; + libraryHaskellDepends = [ + base gambler integer-types quaalude supply-chain transformers + ]; + testHaskellDepends = [ + base containers gambler hspec integer-types quaalude supply-chain + transformers + ]; + description = "Supply-chain interface for basic streaming"; + license = lib.licenses.asl20; + }) {}; + "surjective" = callPackage ({ mkDerivation, base, lens, mtl, template-haskell }: mkDerivation { @@ -276248,25 +277586,24 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base - , bytestring, containers, Diff, dlist, envparse, filepath - , MonadRandom, mtl, optparse-applicative, path, path-io - , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle - , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm - , sydtest-discover, text + , bytestring, containers, dlist, envparse, filepath, MonadRandom + , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck + , quickcheck-io, random, random-shuffle, safe, safe-coloured-text + , safe-coloured-text-terminfo, stm, sydtest-discover, text, vector }: mkDerivation { pname = "sydtest"; - version = "0.13.0.0"; - sha256 = "0msa5y6fl00qjrj08c6bccbav179f05jk9hb9lmfbffq6bc86rc5"; + version = "0.13.0.1"; + sha256 = "0am1bgg2figd3zwd80ia8jayp3ikvvb50wvjaivy4y66gz7x4qb3"; libraryHaskellDepends = [ - async autodocodec autodocodec-yaml base bytestring containers Diff - dlist envparse filepath MonadRandom mtl optparse-applicative path - path-io pretty-show QuickCheck quickcheck-io random random-shuffle - safe safe-coloured-text safe-coloured-text-terminfo split stm text + async autodocodec autodocodec-yaml base bytestring containers dlist + envparse filepath MonadRandom mtl optparse-applicative path path-io + pretty-show QuickCheck quickcheck-io random random-shuffle safe + safe-coloured-text safe-coloured-text-terminfo stm text vector ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text - stm text + stm text vector ]; testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; @@ -276801,8 +278138,8 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.4.0.20211106"; - sha256 = "0fbw0fg78b8wh3fcbvcm9v3qrsvpyymhwd7f9a70yqj90mggl7sc"; + version = "0.5.0.20221211"; + sha256 = "00wkvvwyfy8g2ya86m8jy21656qrfapbf27k4hg6x2r0h87i5ddd"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers @@ -277596,6 +278933,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; + revision = "1"; + editedCabalFile = "0ig8ysmw2hnbxgdv1p4h4vpyq782anw1g8wsqjrj6b0n4kazk5i8"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -277626,6 +278965,8 @@ self: { pname = "synthesizer-dimensional"; version = "0.8.1.1"; sha256 = "0giaa6v2yvb0amvdzdv5bq7dsns9pgbzv7sgjdi4a4zy0x4gmhc4"; + revision = "1"; + editedCabalFile = "15wb7v43ijbjqnnjdjf7c547wjbk4047in84q26b0vzi5nvrb3ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277686,8 +279027,8 @@ self: { pname = "synthesizer-llvm"; version = "0.9"; sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; - revision = "1"; - editedCabalFile = "04z0s3hkpdcmri4w34s2ssz9wwf60z1ccc0bc3bphs1caz8i61j2"; + revision = "2"; + editedCabalFile = "1p9wr4i1q8mv3ghnw46k4dzfagid1f7sx45zbam3ja68ksq1da99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278534,8 +279875,8 @@ self: { }: mkDerivation { pname = "tagchup"; - version = "0.4.1.1"; - sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75"; + version = "0.4.1.2"; + sha256 = "0zlrdlb0f6dhhx163i62ljh1spr0d5gcf0c96m5z7nzq529qq792"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -280075,10 +281416,8 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.2.0.1"; - sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; - revision = "2"; - editedCabalFile = "0qyp20khzr6ingdjmmwlhlklc26257wds56cn2pwss3yf1j5blv1"; + version = "1.2.0.2"; + sha256 = "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -280178,6 +281517,8 @@ self: { pname = "tasty-inspection-testing"; version = "0.2"; sha256 = "1gdwbg545gwfx2a26s7hkgz9l9mfb13i6v20j09hqrlbh1xsi3qz"; + revision = "1"; + editedCabalFile = "1539r8zxbpwf1ia48syslq2j5v6l8czigp4fjwfwdcsf8x5k9j6g"; libraryHaskellDepends = [ base ghc inspection-testing tasty template-haskell ]; @@ -280368,6 +281709,20 @@ self: { broken = true; }) {}; + "tasty-papi" = callPackage + ({ mkDerivation, base, containers, deepseq, papi, stm, tasty }: + mkDerivation { + pname = "tasty-papi"; + version = "0.1.0.1"; + sha256 = "0qlxdcjr8fv05vaspr4bna5wn28c0l0hn9a4znxcrrqlr1wqb3g8"; + libraryHaskellDepends = [ base containers deepseq stm tasty ]; + librarySystemDepends = [ papi ]; + testHaskellDepends = [ base tasty ]; + description = "Bencmarking using instruction counting"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }) {inherit (pkgs) papi;}; + "tasty-prelude" = callPackage ({ mkDerivation, base, tasty, tasty-expected-failure, tasty-focus }: @@ -283337,8 +284692,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.5.4"; - sha256 = "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq"; + version = "0.12.5.5"; + sha256 = "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283352,6 +284707,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.6"; + sha256 = "167y2flpsq3f3npjhrb3bxdbxys2aamgfrs1dr3f6l36hyg8mhvg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -284681,12 +286059,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "th-data-compat_0_1_1_1" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.1.1.1"; + sha256 = "1ry22k1fr50az4gjy6vs3b11a4gp22hkagbbq4r3irqaz059z6dp"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-data-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.1.0"; - sha256 = "0579yxlcl3cfirjim31capk7q2raf9bmmfnvcxxnicjmvx22790q"; + version = "0.1.2.0"; + sha256 = "1x8znbzzkrmp1vfq6blwnwb5cxyr9gkiwj6c5ab4nds4diy3j3cq"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -285850,6 +287240,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "threepenny-flexbox-exe"; + broken = true; }) {}; "thrift" = callPackage @@ -287427,19 +288818,20 @@ self: { "tinkoff-invest-sdk" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, concurrent-extra , errors, http2-client, http2-client-grpc, http2-grpc-proto-lens - , lens, mtl, proto-lens, proto-lens-runtime, proto-lens-setup, text - , unordered-containers + , lens, mtl, proto-lens, proto-lens-protoc, proto-lens-runtime + , proto-lens-setup, text, unordered-containers }: mkDerivation { pname = "tinkoff-invest-sdk"; - version = "0.1.0.0"; - sha256 = "1b66gb1cdlckhiaxbps31dklx0sz9wxs27cpy4zwfn0rxzi96wpv"; + version = "0.1.1.1"; + sha256 = "04l94l77243ik727lbqiy1brcvbgbyns0yl50xq9p87y0spbkrsi"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ async base bytestring concurrent-extra errors http2-client http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens proto-lens-runtime text unordered-containers ]; + libraryToolDepends = [ proto-lens-protoc ]; description = "gRPC based SDK for Tinkoff Invest API V2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -288053,8 +289445,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.7.0.1"; - sha256 = "117kwfqyww9qwsja4vx03vja7g6lgin3iy0ss2ckmdmnddimm9qs"; + version = "0.7.1.0"; + sha256 = "1hf4zfm6gapqd2yi0pylrmrjsgx98c21diixiv7bc7z6xs7g4pbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288473,8 +289865,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "6"; - editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; + revision = "7"; + editedCabalFile = "1nf6ciwh4llnmxsdff0shr8vh3j9x7cpi9hgn1dlas8glz4c6vn1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -288778,16 +290170,16 @@ self: { }) {}; "toml-reader-parse" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, dlist, mtl + ({ mkDerivation, base, comonad, containers, deepseq, dlist , optparse-applicative, prettyprinter, prettyprinter-combinators , tasty, tasty-hunit, text, time, toml-reader, vector }: mkDerivation { pname = "toml-reader-parse"; - version = "0.1.1.0"; - sha256 = "1ah47icy8lnpnmhpsmyp9pvp8f134pzzi6cvv5vpnw2r5szr9vly"; + version = "0.1.1.1"; + sha256 = "0fijwv9zs5ivbxyss81rr5sav99dxn3x35adfrb6pli4qmr7mlzi"; libraryHaskellDepends = [ - base comonad containers deepseq dlist mtl prettyprinter + base comonad containers deepseq dlist prettyprinter prettyprinter-combinators text time toml-reader vector ]; testHaskellDepends = [ @@ -290150,12 +291542,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "transformers-either_0_1_3" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.1.3"; + sha256 = "0vk4pyk26rpyn17r3imn0phl10lgdfw5cpabf77zpkdq8lr154yr"; + libraryHaskellDepends = [ base exceptions text transformers ]; + description = "An Either monad transformer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "transformers-except" = callPackage ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-except"; - version = "0.1.2"; - sha256 = "00zxpip9nhli7ic1zaks7c4hj851dhdgkkwq5qw9vamr6whgh9cr"; + version = "0.1.3"; + sha256 = "038c4gywkhq3qry4h7589z1afh2dw25d6nrhr1yfi0mx4kqanjs8"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; license = lib.licenses.bsd3; @@ -290672,6 +292076,36 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, data-array-byte, deepseq, Diff, hashable, parsec + , parsers, pretty, primitive, QuickCheck, scientific, semialign + , strict, tagged, tasty, tasty-golden, tasty-quickcheck, text + , these, time, trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3"; + sha256 = "12qwq7jv5fd8qrpbx12ldwwz6r3jzil0d3w9wb11nlnzrqv5dh51"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers data-array-byte deepseq hashable + parsec parsers pretty primitive QuickCheck scientific semialign + strict tagged text these time unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -292312,8 +293746,8 @@ self: { pname = "turtle"; version = "1.6.1"; sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; - revision = "1"; - editedCabalFile = "1x4hk9kk8ra855jkzs7dc9691pk14xydixswbx2srs3r9rc6dpjb"; + revision = "2"; + editedCabalFile = "0zkw1mn9z09gkc0yjx6pfqyvrda076qi7ya12vfd1j3b7yljhpdn"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -293471,6 +294905,19 @@ self: { license = lib.licenses.mit; }) {}; + "type-level-kv-list_2_0_1_2" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "2.0.1.2"; + sha256 = "0pm6zz37i57d6xnihybl2q0iqhb7cn1wrz8kxy7id4mpzhkysjis"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Type level Key-Value list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-level-kv-list-esqueleto" = callPackage ({ mkDerivation, base, esqueleto, text, type-level-kv-list }: mkDerivation { @@ -294293,6 +295740,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -295232,6 +296681,8 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-basic-array-bytestring" = callPackage @@ -295247,6 +296698,8 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-common" = callPackage @@ -295636,8 +297089,8 @@ self: { pname = "unescaping-print"; version = "0.1"; sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; - revision = "3"; - editedCabalFile = "0r2ggyy2qla75jxdhd3izqqkqb3ar6538jczfwlbbxrj4w1xkd47"; + revision = "4"; + editedCabalFile = "1n09a1nsb6fm2abcg6zm4xhkgirhfwqbcxym84qaq82d8zmlyxqj"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = lib.licenses.bsd3; @@ -295933,6 +297386,8 @@ self: { pname = "unicode-data"; version = "0.4.0.1"; sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; + revision = "1"; + editedCabalFile = "1lvsn8r1xh8ip5gyrbwv7pk41yf2ynjimpd6g4am3n7j92djc7h8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295951,6 +297406,8 @@ self: { pname = "unicode-data-names"; version = "0.2.0"; sha256 = "0i28rp5g6wmnga6i95a6cq3dhkjg3v477xwycbcl38dfwdj3iy2c"; + revision = "1"; + editedCabalFile = "1pxpg1mkv9yq26h9xcvxa6wza14y65g3j73gvs2nfmg4byksfdml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295971,6 +297428,8 @@ self: { pname = "unicode-data-scripts"; version = "0.2.0.1"; sha256 = "0kpa2g59w9yiyl3adak7k0g9wnkwzv97c82x7bsrqvk23bdljxc0"; + revision = "1"; + editedCabalFile = "1f6kz6kwv9v087bzjss29qaid03vig6njnsa1w46p93dn2xscvsm"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec unicode-data ]; benchmarkHaskellDepends = [ @@ -295990,6 +297449,8 @@ self: { pname = "unicode-data-security"; version = "0.2.0"; sha256 = "10x58l62i7bj9kmnchp1rggln40sfbsyw4pxlzbk8dmhkh5zmdlx"; + revision = "1"; + editedCabalFile = "0mbsz5ynisjclzprvqvwd8q6l7kmv31qc2nkpbix05ipcrm0p4qg"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -296522,8 +297983,8 @@ self: { }: mkDerivation { pname = "unique-logic"; - version = "0.4"; - sha256 = "0lza0g7mvij6fj07nfyrgl7vy6hpqmmmzbnxylq71jb4a90sn28j"; + version = "0.4.0.1"; + sha256 = "05y401k00qminds1di27sxvhwjl5xn6yn1qq1vnbhs0ib4s8csvy"; libraryHaskellDepends = [ base explicit-exception transformers utility-ht ]; @@ -296542,6 +298003,8 @@ self: { pname = "unique-logic-tf"; version = "0.5.1"; sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; + revision = "1"; + editedCabalFile = "1bnd8jyrrawszaxz5w7jibys9qygp2gx39g5y312f0k5468x25qh"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -296718,8 +298181,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uniqueness-periods-vector-stats"; - version = "0.3.0.0"; - sha256 = "0vfkjmp730w9f0174fx0mpfrrbd2grwd838wnrrlxnv39y345i6h"; + version = "0.4.0.0"; + sha256 = "0ip401h6mgyz2qi391d1pjg37mrpf1qfa9pxdxga7r0bkmzs26hg"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = lib.licenses.mit; @@ -300748,8 +302211,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "1"; - editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl"; + revision = "2"; + editedCabalFile = "19d6c1gp5d6v5wlg386aphn7893axba0zicpi7n5s4a55bqazs51"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -301156,8 +302619,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-rotcev"; - version = "0.1.0.1"; - sha256 = "1zrw1r6xspjncavd307xbbnjdmmhjq9w3dbvm0khnkxjgh47is8v"; + version = "0.1.0.2"; + sha256 = "1ch8r6v07qvczp7cn7l4hxy7pakj37hkx5vp7vz5yk3bcnjb1mqc"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; @@ -301260,8 +302723,8 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.2"; - sha256 = "05mxkgcg5v2w0vnqq8z5s6aj0aqi7b55mh6knaafalpc1yjyxbml"; + version = "1.0.0.3"; + sha256 = "1y2imndpyx15jmiajhabi34522jcayrz05zrxiv1srj4fssz56bd"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector @@ -301300,8 +302763,8 @@ self: { pname = "vector-stream"; version = "0.1.0.0"; sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; - revision = "1"; - editedCabalFile = "18sm3vd1qim9r3m40wgvnmcrfz1zl051yy84dffnp4si9vfgic09"; + revision = "2"; + editedCabalFile = "1jldm2bh9d0y7vmyv3l85ilps4n8ypqr6da0cgqg5dfi3hlxbmpm"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -302819,6 +304282,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_38" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, containers, deepseq, directory, filepath, microlens + , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.38"; + sha256 = "18s84rrc1dhm5j8c24r8lgk8hjdrwsdjgf6hilqcdm90dx6jz0al"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath microlens microlens-mtl microlens-th mtl + parsec stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -302900,8 +304388,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.3"; - sha256 = "00ral8nlksr37xqdmy0wb4r3f67g81fd8xx4glw4zj07jqlk4pm3"; + version = "3.24.4"; + sha256 = "0lpgnmdk05lc4za98i8p7l0g1c5c4cvigm423k1qh2k287wcdhan"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -305204,6 +306692,8 @@ self: { pname = "warp"; version = "3.3.23"; sha256 = "0y1r7czq5zrgklqrx1b9pmxn5lhmf7zpqdjz7hfmnzsmr3vndmms"; + revision = "1"; + editedCabalFile = "04akn70kmgmw7scapks11srfy44nqj9cy03qsp6rawlzwbxwk9id"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -305790,6 +307280,7 @@ self: { description = "Monoidally construct web pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "web-plugins" = callPackage @@ -305916,6 +307407,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "web-routes-happstack_0_23_12_3" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, text + , web-routes + }: + mkDerivation { + pname = "web-routes-happstack"; + version = "0.23.12.3"; + sha256 = "1qkbaq5k9as5s0bdaiza02jfg17vwmsfwg6r3gg95sh4l5rvwyx6"; + libraryHaskellDepends = [ + base bytestring happstack-server text web-routes + ]; + description = "Adds support for using web-routes with Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "web-routes-hsp" = callPackage ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { @@ -306277,8 +307784,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.4.1.2"; - sha256 = "1xdqq80jcxzd0qvmsgrcpjkw4lpcsws2pin2v3v1gpf0qv0syi36"; + version = "0.5.0.0"; + sha256 = "1kyjwg5hf3v1hxpsk9w9mdz601dyahr0a50z83bwaqgys9fb7m8d"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -306939,8 +308446,8 @@ self: { pname = "websockets"; version = "0.12.7.3"; sha256 = "0g3z0n4irf3gvbdf9p97jq05ybdg0gwjy5bj4nfc7ivsvyhaic6k"; - revision = "1"; - editedCabalFile = "1yx97y6jl74vy200y43vjxfyzx338kh10dx8vxkjhr0mfh36wldq"; + revision = "2"; + editedCabalFile = "045dsjhhwv73wrs6f91az9hvxygznmx14g6f3fv69yhz9s6lbkry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307096,19 +308603,14 @@ self: { }) {}; "wedged" = callPackage - ({ mkDerivation, array, base, colour, containers, diagrams-lib - , diagrams-postscript, MonadRandom, strict - }: + ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "wedged"; - version = "3"; - sha256 = "1v7xc7bnyhlb2fs0j8zafbnvzyl0hsdyl59f0kibmn0w6sxq34xl"; + version = "4"; + sha256 = "19zkwzj9daz1zz0g20bgr6ardqkgizhfnajdq44g7lydykjnnij4"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - array base colour containers diagrams-lib diagrams-postscript - MonadRandom strict - ]; + executableHaskellDepends = [ array base containers random ]; description = "Wedged postcard generator"; license = "unknown"; hydraPlatforms = lib.platforms.none; @@ -307170,7 +308672,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "weeder" = callPackage + "weeder_2_4_1" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl , optparse-applicative, regex-tdfa, text, transformers @@ -307192,6 +308694,33 @@ self: { ]; description = "Detect dead code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "weeder"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "weeder" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.5.0"; + sha256 = "17i8mmkmqf0fc1gad3r5zw3ypc31q2vwqryl5n1wbh402sycn7il"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; mainProgram = "weeder"; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -307432,41 +308961,42 @@ self: { "what4" = callPackage ({ mkDerivation, async, attoparsec, base, bifunctors, bimap - , bv-sized, bytestring, concurrent-extra, config-value, containers - , contravariant, data-binary-ieee754, deepseq, deriving-compat - , directory, exceptions, filepath, fingertree, ghc-prim, hashable - , hashtables, hedgehog, io-streams, lens, libBF, lumberjack, mtl - , panic, parameterized-utils, prettyprinter, process, QuickCheck - , scientific, tasty, tasty-checklist, tasty-expected-failure - , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-sugar - , template-haskell, temporary, text, th-abstraction, th-lift - , th-lift-instances, transformers, unordered-containers - , utf8-string, vector, versions, zenc + , BoundedChan, bv-sized, bytestring, concurrent-extra, config-value + , containers, contravariant, deepseq, deriving-compat, directory + , exceptions, filepath, fingertree, ghc-prim, hashable, hashtables + , hedgehog, io-streams, lens, libBF, lumberjack, megaparsec, mtl + , ordered-containers, panic, parameterized-utils, parsec + , prettyprinter, process, QuickCheck, s-cargot, scientific, stm + , tasty, tasty-checklist, tasty-expected-failure, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, tasty-sugar, template-haskell + , temporary, text, th-abstraction, th-lift, th-lift-instances, time + , transformers, unliftio, unordered-containers, utf8-string, vector + , versions, zenc }: mkDerivation { pname = "what4"; - version = "1.3"; - sha256 = "03p4sk543vygmah0mf1nzlxv9l3qzaiy023if3cszcwys22gr7kq"; + version = "1.4"; + sha256 = "1cmvf1cn4x3g86idbhs27f2hpm0vri51hcrvlss2bx4z85vk649b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - async attoparsec base bifunctors bimap bv-sized bytestring - concurrent-extra config-value containers data-binary-ieee754 - deepseq deriving-compat directory exceptions filepath fingertree - ghc-prim hashable hashtables io-streams lens libBF mtl panic - parameterized-utils prettyprinter process scientific - template-haskell temporary text th-abstraction th-lift - th-lift-instances transformers unordered-containers utf8-string - vector versions zenc + async attoparsec base bifunctors bimap BoundedChan bv-sized + bytestring concurrent-extra config-value containers deepseq + deriving-compat directory exceptions filepath fingertree ghc-prim + hashable hashtables io-streams lens libBF megaparsec mtl + ordered-containers panic parameterized-utils parsec prettyprinter + process s-cargot scientific stm template-haskell temporary text + th-abstraction th-lift th-lift-instances time transformers unliftio + unordered-containers utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ - base bv-sized bytestring containers contravariant - data-binary-ieee754 exceptions hedgehog io-streams libBF lumberjack + async base bv-sized bytestring containers contravariant directory + exceptions hedgehog io-streams libBF lumberjack ordered-containers parameterized-utils prettyprinter process QuickCheck tasty tasty-checklist tasty-expected-failure tasty-hedgehog tasty-hunit - tasty-quickcheck tasty-sugar text transformers versions + tasty-quickcheck tasty-sugar temporary text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -308724,8 +310254,10 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.8"; - sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8"; + version = "0.1.2.9"; + sha256 = "0i0bdxm9pr7a1qzr73657xy62d05a54k3ksy229q07ydz04j5mmz"; + revision = "1"; + editedCabalFile = "0fmbhinfg1lcqym0b3wx5q0zv3r7pl9l0as3rv33gh2gjcvvf2nv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308741,7 +310273,9 @@ self: { benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "wrd"; + broken = true; }) {}; "wordcloud" = callPackage @@ -309176,8 +310710,8 @@ self: { }: mkDerivation { pname = "wraxml"; - version = "0.4.4.2"; - sha256 = "1cfbbr1fbp7wrm2w7rldvf3gvp8fzvnpa6c2mkxscarhmn5wl92z"; + version = "0.4.4.3"; + sha256 = "11b48rjpj2glm5bxg8mw9m73qfprb2a8gc57s06sh0n50295di2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309905,14 +311439,15 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets + ({ mkDerivation, base, bytestring, connection, exceptions, network + , websockets }: mkDerivation { pname = "wuss"; - version = "2.0.0.2"; - sha256 = "04jqq3blzyxqyymhcjsm5z89whk5y7cvnd9dw6nlc40vq4w4v802"; + version = "2.0.1.0"; + sha256 = "0hl8s3fwmvxw0zamz72mzhs0pf84qvpyzhd6fjk03whrvg3f4qh7"; libraryHaskellDepends = [ - base bytestring connection network websockets + base bytestring connection exceptions network websockets ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; @@ -310956,8 +312491,8 @@ self: { }: mkDerivation { pname = "xml-basic"; - version = "0.1.3.1"; - sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d"; + version = "0.1.3.2"; + sha256 = "0kj26v20rakmmxk0gf6dccmxkcv39mnpcj9dfx45yr27a53b8170"; libraryHaskellDepends = [ base containers data-accessor explicit-exception semigroups utility-ht @@ -311286,8 +312821,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; - revision = "1"; - editedCabalFile = "0ga90h55aw3f946xk1x2ailnwinw3v4icw9xirgncgf3lajwxl4f"; + revision = "2"; + editedCabalFile = "0n4clndkzg6cjw0slkbrn64byzdnlsxrf6va3xgvsry9d1i18ihf"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -317116,6 +318651,8 @@ self: { testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yu-core" = callPackage @@ -317612,8 +319149,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.6"; - sha256 = "0lakan23rddv8rlrd5h7jzc3g59h22hpdbjgabn4v76aaxpk3rga"; + version = "1.0.7"; + sha256 = "1ss7p1wzcxiap8zm3i6hqllkd0hkrp6bgk4magbaxpy7ic9kifb9"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index ebaba1a22fa6..fa6d2a20a9a2 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -464,4 +464,44 @@ rec { allowInconsistentDependencies = overrideCabal (drv: { allowInconsistentDependencies = true; }); + + # Work around a Cabal bug requiring pkg-config --static --libs to work even + # when linking dynamically, affecting Cabal 3.8 and 3.9. + # https://github.com/haskell/cabal/issues/8455 + # + # For this, we treat the runtime system/pkg-config dependencies of a Haskell + # derivation as if they were propagated from their dependencies which allows + # pkg-config --static to work in most cases. + # + # Warning: This function may change or be removed at any time, e.g. if we find + # a different workaround, upstream fixes the bug or we patch Cabal. + __CabalEagerPkgConfigWorkaround = + let + # Take list of derivations and return list of the transitive dependency + # closure, only taking into account buildInputs. Loosely based on + # closePropagationFast. + propagatedPlainBuildInputs = drvs: + builtins.map (i: i.val) ( + builtins.genericClosure { + startSet = builtins.map (drv: + { key = drv.outPath; val = drv; } + ) drvs; + operator = { val, ... }: + if !lib.isDerivation val + then [ ] + else + builtins.concatMap (drv: + if !lib.isDerivation drv + then [ ] + else [ { key = drv.outPath; val = drv; } ] + ) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]); + } + ); + in + overrideCabal (old: { + benchmarkPkgconfigDepends = propagatedPlainBuildInputs old.benchmarkPkgconfigDepends or [ ]; + executablePkgconfigDepends = propagatedPlainBuildInputs old.executablePkgconfigDepends or [ ]; + libraryPkgconfigDepends = propagatedPlainBuildInputs old.libraryPkgconfigDepends or [ ]; + testPkgconfigDepends = propagatedPlainBuildInputs old.testPkgconfigDepends or [ ]; + }); } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5b9546e7505f..7104a2164af3 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -254,7 +254,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # a cabal flag with '--flag=myflag'. developPackage = { root - , name ? if builtins.typeOf root == "path" then builtins.baseNameOf root else "" + , name ? lib.optionalString (builtins.typeOf root == "path") (builtins.baseNameOf root) , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index 688844bcc46c..50daaf136231 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -10,9 +10,8 @@ let let version = pkg.version or ""; in - if isPvpVersion version then - ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'' - else ""; + lib.optionalString (isPvpVersion version) + ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"''; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); in runCommand "hackage-package-list" { } diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch deleted file mode 100644 index 9e1eeb751602..000000000000 --- a/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/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch deleted file mode 100644 index d99072d79c6e..000000000000 --- a/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/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch deleted file mode 100644 index 04ff068e1d02..000000000000 --- a/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/pkgs/development/haskell-modules/patches/darcs-setup.patch b/pkgs/development/haskell-modules/patches/darcs-setup.patch deleted file mode 100644 index fbc7efde428e..000000000000 --- a/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/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch deleted file mode 100644 index 7ed390d3f237..000000000000 --- a/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/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch deleted file mode 100644 index 48cf6a035afb..000000000000 --- a/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/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch new file mode 100644 index 000000000000..948a0366ca4e --- /dev/null +++ b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch @@ -0,0 +1,12 @@ +diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs +index 598048f..b652b76 100644 +--- a/src/Gtk2HsSetup.hs ++++ b/src/Gtk2HsSetup.hs +@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor + ourC2hs bi lbi = PreProcessor { + #endif + platformIndependent = False, ++ ppOrdering = (\ _ _ ms -> return ms), + runPreProcessor = runC2HS bi lbi + } + diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch deleted file mode 100644 index cc115029a7ad..000000000000 --- a/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/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 77ccd301b43f..34eb2b71d759 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -49,11 +49,12 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.concatLists ( diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index d50ed8ff0520..f8fb244d54c9 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/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/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 95b7d611fa94..dfae27b37104 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1208"; + version = "1.11.1.1224"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM="; + sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix index 03dfb72d7aba..8ece89ef4f48 100644 --- a/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix @@ -19,7 +19,7 @@ lib.makePackageOverridable name = "dhall-directory-package.nix"; buildCommand = '' - dhall-to-nixpkgs directory --fixed-output-derivations --file "${file}" "${src}" ${if document then "--document" else ""} > $out + dhall-to-nixpkgs directory --fixed-output-derivations --file "${file}" "${src}" ${lib.optionalString document "--document"} > $out ''; nativeBuildInputs = [ dhall-nixpkgs ]; diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index b2ad0846cd68..991880bc31e5 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.2.2"; - sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs="; + version = "25.2.3"; + sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE="; } diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 3bcada9aa8f0..e413914aa39c 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { "-Wno-error=maybe-uninitialized" # Needed with GCC 11 "-Wno-error=misleading-indentation" + # Needed with GCC 12 + "-Wno-error=nonnull" + "-Wno-error=stringop-overflow" + "-Wno-error=use-after-free" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 0f88c7331140..caeef615ff68 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.560"; + version = "0.563"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-tGZ9gy/RqkVP/pXyMd2XgdVc2oekZfpsdDgAB3+rv9s="; + hash = "sha256-aGduwwguzIg3kFspIa/5nDFAC836J3B10Pg63psuWto="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dff3e4101d55..e221956cf225 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -186,7 +186,7 @@ let NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8"; configureFlags = [ "--with-blas=blas" diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 37277baae814..ddc4ed17acbd 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.27"; - hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g="; + version = "8.0.28"; + hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 6cfda280d3ef..48cf458178b6 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/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.16"; + hash = "sha256-zZ8OoU2C2UVVh6SaC2yAKnuNj/eXA/n0ixfbAQ+2M84="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 41627582dc83..6dea1c8f9076 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/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.3"; + hash = "sha256-h7tYhl849eKUGBMCkVLOohAv4pYbtNaLiPgx3dBUjQ8="; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index b8ceac621a61..74dedcfe2d18 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -333,6 +333,7 @@ let description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; + mainProgram = "php"; maintainers = teams.php.members; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 005858d31ef6..66566cf5c277 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/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/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 0f0a3f5e6746..08e2717d41c1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -63,7 +63,7 @@ hooks = import ./hooks/default.nix; keep = lib.extends hooks pythonPackagesFun; extra = _: {}; - optionalExtensions = cond: as: if cond then as else []; + optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ([ @@ -196,9 +196,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "a3"; + suffix = "a5"; }; - sha256 = "sha256-G2SzB14KkkGXTlgOCbCckRehxOK+aYA5IB7x2Kc0U9E="; + sha256 = "sha256-1m73o0L+OjVvnO47uXrcHl+0hA9rbP994P991JX4Mjs="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 6fad25ee8d63..b7597a9925b6 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -26,7 +26,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else if isPy3k then "3" else ""}"; + executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else lib.optionalString isPy3k "3"}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; inherit pythonAttr; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index a25ab8a78221..9b3baf84848b 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "lib/${libPrefix}/site-packages"; hasDistutilsCxxPatch = false; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index a95e0c2f651e..ddf3963060d1 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index d5b02223fd6c..ee94d4aec031 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -39,7 +39,7 @@ let })); # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg self; + buildSetupcfg = import ../../../build-support/build-setupcfg lib self; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 577f4c0fcf2c..03f6fb31cb54 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/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/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9ddaa0f14143..c52869344a6a 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/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/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index cfdeac264cbd..6602a6484f73 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.14.6"; + version = "0.16.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; + sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 07c917473cc4..d5505009a070 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]); RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib ]); enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 57d1e6d84fe1..4461bd08365e 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -273,13 +273,13 @@ in { mkRuby = generic; ruby_2_7 = generic { - version = rubyVersion "2" "7" "6" ""; - sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"; + version = rubyVersion "2" "7" "7" ""; + sha256 = "sha256-4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A="; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "4" ""; - sha256 = "0avj4g3s2839b2y4m6pk8kid74r8nj7k0qm2rsdcwjzhg8h7rd3h"; + version = rubyVersion "3" "0" "5" ""; + sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y="; }; ruby_3_1 = generic { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bdc4cf3690fe..2bf5bc7296c6 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,17 +1,15 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.6" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-with-openssl-dir-option.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/02-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/03-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/04-more-detailed-stacktrace.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/05-malloc-trim.patch" + "2.7.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/04-malloc-trim.patch" ]; - "3.0.4" = ops useRailsExpress [ - "${patchSet}/patches/ruby/3.0/head/railsexpress/01-fix-with-openssl-dir-option.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/03-malloc-trim.patch" + "3.0.5" = ops useRailsExpress [ + "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" + "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; "3.1.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.1/head/railsexpress/01-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/ruby/ruby-version.nix b/pkgs/development/interpreters/ruby/ruby-version.nix index 23f7f46a47af..57fa60aea28c 100644 --- a/pkgs/development/interpreters/ruby/ruby-version.nix +++ b/pkgs/development/interpreters/ruby/ruby-version.nix @@ -55,9 +55,9 @@ let self.majMinTiny + ( if self.patchLevel != null then "-p${self.patchLevel}" - else if self.tail != "" then - "-${self.tail}" - else ""); + else + lib.optionalString (self.tail != "") "-${self.tail}" + ); }; in rubyVersion diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 51c0a9a7dfb3..fbbfd4c97302 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "a6429bb1a7fb9b5798c22f43338739a6c192b42d"; - sha256 = "sha256-NpSa+uGQA1rfHNcLzPNTK65J+Wk9ZlzhHFePDA4uuo0="; + rev = "e6574c54a34fe6e4d45aa1433872a22ddfe14cf3"; + hash = "sha256-x2KvhgRVJ4Nc5v1j4DggKO1u3otG8HVMxhq4yuUKnds="; } diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix index ef89d1ca0a27..ff6808b13b0a 100644 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.1.0"; - hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; + version = "102.8.0"; + hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ=="; } diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ca771fa75fd6..0ffa5fc287d5 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "91.12.0"; - hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg=="; + version = "91.13.0"; + hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg=="; } diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 32a0ae2e7467..a4310b8f206f 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -62,19 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - - # Patches required by GJS - # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658 - # Install ProfilingCategoryList.h - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a"; - sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI="; - }) - # Fix embeder build - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b"; - sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA="; - }) ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index ecb3d5787eb3..7271e5073c32 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -2,8 +2,8 @@ , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs -, supercollider-with-plugins, supercolliderPlugins -, writeText, runCommand +, gitUpdater, supercollider-with-plugins +, supercolliderPlugins, writeText, runCommand }: mkDerivation rec { @@ -26,6 +26,8 @@ mkDerivation rec { }) ]; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] @@ -39,24 +41,32 @@ mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - passthru.tests = { - # test to make sure sclang runs and included plugins are successfully found - sclang-sc3-plugins = let - supercollider-with-test-plugins = supercollider-with-plugins.override { - plugins = with supercolliderPlugins; [ sc3-plugins ]; - }; - testsc = writeText "test.sc" '' - var err = 0; - try { - MdaPiano.name.postln; - } { - err = 1; + passthru = { + updateScript = gitUpdater { + url = "https://github.com/supercollider/supercollider.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + + tests = { + # test to make sure sclang runs and included plugins are successfully found + sclang-sc3-plugins = let + supercollider-with-test-plugins = supercollider-with-plugins.override { + plugins = with supercolliderPlugins; [ sc3-plugins ]; }; - err.exit; + testsc = writeText "test.sc" '' + var err = 0; + try { + MdaPiano.name.postln; + } { + err = 1; + }; + err.exit; + ''; + in runCommand "sclang-sc3-plugins-test" { } '' + timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out ''; - in runCommand "sclang-sc3-plugins-test" {} '' - timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out - ''; + }; }; meta = with lib; { diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a596d6d770ae..c7058817722e 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, supercollider, fftw }: +{ stdenv, lib, fetchurl, cmake, supercollider, fftw, gitUpdater }: stdenv.mkDerivation rec { pname = "sc3-plugins"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { stripDebugList = [ "lib" "share" ]; + passthru.updateScript = gitUpdater { + url = "https://github.com/supercollider/sc3-plugins.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 41603037931f..8548ac66402f 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -41,6 +41,8 @@ findInstalledTclPkgs() { # Wrap any freshly-installed binaries and set up their TCLLIBPATH wrapTclBins() { + if [ "$dontWrapTclBinaries" ]; then return; fi + if [[ -z "${TCLLIBPATH-}" ]]; then echo "skipping automatic Tcl binary wrapping (nothing to do)" return diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 770661c60534..c1a20a198f3b 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, withThread ? true, withSSL ? true, xxd }: +{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, valgrind, withThread ? true, withSSL ? true, xxd }: stdenv.mkDerivation rec { pname = "trealla"; - version = "2.2.6"; + version = "2.8.4"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-DxlexijQPcNxlPjo/oIvsN//8nZ0injXFHc2t3n4yjg="; + sha256 = "sha256-/jB4jlYotvdU068+zj9Z+G0g75sI9dTmtgN874i0qAE="; }; postPatch = '' @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xxd ]; buildInputs = [ readline openssl libffi ]; + checkInputs = [ valgrind ]; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index b2844f723bc2..30a4244e4f84 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "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/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index b35880e013c8..c058590c8574 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -5,7 +5,7 @@ , sha512 , type ? "jar" , suffix ? "" -, sourceProvenance ? (if type == "jar" then [ lib.sourceTypes.binaryBytecode ] else []) +, sourceProvenance ? (lib.optionals (type == "jar") [ lib.sourceTypes.binaryBytecode ]) }: let diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 4ff02ffb7b2e..a8824904aea8 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/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/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index f424a2e67f56..06793ee5e551 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.20.1"; + version = "2.20.2"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc="; + sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/development/libraries/StormLib/default.nix b/pkgs/development/libraries/StormLib/default.nix index 0bf9ba63dc48..bc247e956235 100644 --- a/pkgs/development/libraries/StormLib/default.nix +++ b/pkgs/development/libraries/StormLib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }: stdenv.mkDerivation rec { pname = "StormLib"; @@ -11,13 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc"; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks" + ''; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DWITH_LIBTOMCRYPT=ON" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 libtomcrypt zlib ]; + buildInputs = [ bzip2 libtomcrypt zlib ] ++ + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; meta = with lib; { homepage = "https://github.com/ladislav-zezula/StormLib"; diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix index 61187581e9aa..4f605b8af98b 100644 --- a/pkgs/development/libraries/applet-window-buttons/default.nix +++ b/pkgs/development/libraries/applet-window-buttons/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , extra-cmake-modules , kcoreaddons @@ -20,6 +21,14 @@ mkDerivation rec { hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE="; }; + patches = [ + # FIXME: cherry-pick Plasma 5.27 build fix, remove for next release + (fetchpatch { + url = "https://github.com/psifidotos/applet-window-buttons/commit/924994e10402921bf22fefc099bca2914989081c.diff"; + hash = "sha256-4ErqmkIbkvKwns50LhI8Et1EMyvrXYcNRL1rXCxau2w="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch b/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch new file mode 100644 index 000000000000..4bacb891f221 --- /dev/null +++ b/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/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 0d980db9b5a8..36a82afcf860 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/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/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dd7691762567..7837fad283c0 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/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/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 5c60723309b7..4bebd827145f 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -43,7 +43,7 @@ # non-existent in older versions # see https://github.com/boostorg/process/issues/55 , enableS3 ? (!stdenv.isDarwin) || (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") -, enableGcs ? !stdenv.isDarwin # google-cloud-cpp is not supported on darwin +, enableGcs ? (!stdenv.isDarwin) && (lib.versionAtLeast grpc.cxxStandard "17") # google-cloud-cpp is not supported on darwin, needs to support C++17 }: assert lib.asserts.assertMsg @@ -52,17 +52,19 @@ assert lib.asserts.assertMsg let arrow-testing = fetchFromGitHub { + name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; - hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; + rev = "ecab1162cbec872e17d949ecc86181670aee045c"; + hash = "sha256-w6rEuxfLTEO8DyXV44G6JOMeTfYtskFCOj9rHXNmj2Y="; }; parquet-testing = fetchFromGitHub { + name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "aafd3fc9df431c2625a514fb46626e5614f1d199"; - hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; + rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2"; + hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg="; }; aws-sdk-cpp-arrow = aws-sdk-cpp.override { @@ -79,11 +81,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "9.0.0"; + version = "11.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU="; + hash = "sha256-Ldjw6ghIpYeFYo7jpXZ1VI1QnhchOi9dcrDZALQ/VDA="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -108,15 +110,15 @@ stdenv.mkDerivation rec { ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "8.1.0"; - hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; + rev = "9.0.1"; + hash = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.6.0"; - hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno="; + rev = "v0.20.0"; + hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; }; patches = [ @@ -148,18 +150,17 @@ stdenv.mkDerivation rec { utf8proc zlib zstd - ] ++ lib.optionals enableShared [ - python3.pkgs.python - python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc openssl protobuf + sqlite ] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ] ++ lib.optionals enableGcs [ crc32c curl - google-cloud-cpp grpc + google-cloud-cpp + grpc nlohmann_json ]; @@ -183,16 +184,12 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" - "-DARROW_ENGINE=ON" "-DARROW_FILESYSTEM=ON" "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" "-DARROW_HDFS=ON" "-DARROW_IPC=ON" "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" - "-DARROW_PLASMA=ON" - # Disable Python for static mode because openblas is currently broken there. - "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-DARROW_USE_GLOG=ON" "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" @@ -203,21 +200,21 @@ stdenv.mkDerivation rec { "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" "-DARROW_MIMALLOC=ON" - # Parquet options: - "-DARROW_PARQUET=ON" "-DARROW_SUBSTRAIT=ON" - "-DPARQUET_BUILD_EXECUTABLES=ON" "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" + # Parquet options: + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + "-DPARQUET_REQUIRE_ENCRYPTION=ON" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables - ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" - ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" - ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ]; + ] ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; @@ -239,31 +236,33 @@ stdenv.mkDerivation rec { "TestS3FSGeneric.*" ]; in - lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; + lib.optionalString doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; + __darwinAllowLocalNetworking = true; - nativeInstallCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; - installCheckPhase = - let - excludedTests = lib.optionals stdenv.isDarwin [ - # Some plasma tests need to be patched to use a shorter AF_UNIX socket - # path on Darwin. See https://github.com/NixOS/nix/pull/1085 - "plasma-external-store-tests" - "plasma-client-tests" - ] ++ [ "arrow-gcsfs-test" ]; - in - '' - runHook preInstallCheck - ctest -L unittest \ - --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' + nativeInstallCheckInputs = [ perl which sqlite ] + ++ lib.optionals enableS3 [ minio ] + ++ lib.optionals enableFlight [ python3 ]; - runHook postInstallCheck - ''; + disabledTests = [ + # requires networking + "arrow-gcsfs-test" + "arrow-flight-integration-test" + ]; + + installCheckPhase = '' + runHook preInstallCheck + + ctest -L unittest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$' + + runHook postInstallCheck + ''; meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; + broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 81d9e54de435..ed0476fea642 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 3d5d973eec55..fc5162b34e8d 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/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/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index d5562d89f50f..28f13d50f784 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.14"; + version = "0.13.15"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ROSBjRvl036dslLZF5WgdBnlRvafrNaRzt65wfnk0s="; + sha256 = "sha256-UunYt5S8Xz/EZOojl+by3LaHidBE/P4Uwppm4SeHVP0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 152572c6b16a..a76068548122 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -29,11 +29,14 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - NIX_CFLAGS_COMPILE = toString [ + NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" "-Wno-error=stringop-overflow" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs and probably clang + "-Wno-error=use-after-free" ]; propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 61c2a27f3d85..955157d055a2 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -30,6 +30,11 @@ buildGoModule { export GOARCH=$(go env GOHOSTARCH) ''; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-Wno-error=stringop-overflow" + ]; + buildPhase = '' ninjaBuildPhase ''; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 71ac20c4f31b..1c5126584c2c 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5203e941b3d0..e2658423ad35 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/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/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 4bccc0c5cf2f..5791924ad14a 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + meta = with lib; { description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 8640fb6b5c9c..f05f55cd8c92 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/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/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index c1e7b52c0403..70a59bfa0db7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/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-pdf"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index d21c0243bf3d..578b4341e73e 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; + sha256 = "sha256-e90N8bHFt3dOzppa4xkB7qra7/bHhAexTEYGXPFXS4s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 98acd0530e85..566c427d46a6 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-laLi3ks5r0C61LDoCEgVqmqZ7/C18qQKxPm4zmQrw78="; + hash = "sha256-MPkZGKewusCw5TsW5NOtnrjqEK2dxRSCal1fn7Yiaio="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 861e9179e094..d928b814e826 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -30,11 +30,14 @@ stdenv.mkDerivation rec { "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; - patches = # From debian - [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch - ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch - ./Install-contribs-lib.patch - ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; + patches = [ + # From debian + ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch + ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch + ./Install-contribs-lib.patch + # From arch + ./fix-missing-include-time.patch + ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; # fails with "Unable to find executable: # /build/clucene-core-2.3.3.4/build/bin/cl_test" diff --git a/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch b/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch new file mode 100644 index 000000000000..0ac26f76929a --- /dev/null +++ b/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch @@ -0,0 +1,49 @@ +From c1c2000c35ff39b09cb70fbdf66a107d3b17a674 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Wed, 12 Oct 2022 08:40:49 +0200 +Subject: [PATCH] Fix missing #include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +At least on recent Fedora 37 beta, building now failed with + +> CLucene/document/DateTools.cpp:26:19: error: ‘gmtime’ was not declared in this scope +> 26 | tm *ptm = gmtime(&secs); +> | ^~~~~~ + +etc. + +As it turns out, after 22f9d40320e3deeaa8d6aaa7a770077c20a21dae "git-svn-id: +https://clucene.svn.sourceforge.net/svnroot/clucene/branches/lucene2_3_2@2672 +20ef185c-fe11-0410-a618-ba9304b01011" on 2008-06-26 had commented out +_CL_TIME_WITH_SYS_TIME in clucene-config.h.cmake as "not actually used for +anything", then cceccfb52917b5f4da447f1cf20c135952d41442 "Presenting DateTools +and deprecating DateField. DateTools still requires some testing and its own +unit testing" on 2008-06-29 had introduced this use of it (into then +src/CLucene/document/DateTools.H). And apparently most build environments have +silently been happy ever since when the dead leading check for +_CL_TIME_WITH_SYS_TIME didn't include both and , but the +following check for _CL_HAVE_SYS_TIME_H only included but not +. +--- + src/shared/CLucene/clucene-config.h.cmake | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/shared/CLucene/clucene-config.h.cmake b/src/shared/CLucene/clucene-config.h.cmake +index bd8683a5..6fe0f92b 100644 +--- a/src/shared/CLucene/clucene-config.h.cmake ++++ b/src/shared/CLucene/clucene-config.h.cmake +@@ -100,8 +100,7 @@ ${SYMBOL__T} + //#cmakedefine _CL_STAT_MACROS_BROKEN + + /* Define to 1 if you can safely include both and . */ +-//not actually used for anything... +-//#cmakedefine _CL_TIME_WITH_SYS_TIME 1 ++#cmakedefine _CL_TIME_WITH_SYS_TIME 1 + + /* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) +-- +2.37.3 + diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index bd89b18dc756..1d89025a51fa 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/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/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 88e5bcf5d9d7..6f4cdb1cf687 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0="; + sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; }; patches = [ @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { rm test/libc/calls/sched_setscheduler_test.c rm test/libc/thread/pthread_create_test.c rm test/libc/calls/getgroups_test.c + + # fails + rm test/libc/stdio/posix_spawn_test.c ''; installPhase = '' diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix index 44fcbe5463cb..38acb5def4a3 100644 --- a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-Wno-error=range-loop-construct" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" ]; meta = with lib; { diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 09d07064527a..bccba589e031 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "crossguid"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; diff --git a/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch new file mode 100644 index 000000000000..5d41552df37c --- /dev/null +++ b/pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch @@ -0,0 +1,26 @@ +From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Mon, 3 Oct 2022 22:57:34 +0200 +Subject: [PATCH] Use full path in pkgconfig + +Signed-off-by: Pascal Bach +--- + PkgConfig.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in +index 381e2343..93860ff0 100644 +--- a/PkgConfig.pc.in ++++ b/PkgConfig.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: Eclipse Cyclone DDS library +-- +2.37.3 + diff --git a/pkgs/development/libraries/cyclondds/default.nix b/pkgs/development/libraries/cyclondds/default.nix new file mode 100644 index 000000000000..649446908395 --- /dev/null +++ b/pkgs/development/libraries/cyclondds/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cyclondds"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds"; + rev = version; + sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268="; + }; + + patches = [ + ./0001-Use-full-path-in-pkgconfig.patch + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Eclipse Cyclone DDS project"; + homepage = "https://cyclonedds.io/"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 005f1ac0302c..1e38ddf44e19 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { + "dbus-c++-threading.patch?id=7f371172f5c"; sha256 = "1h362anx3wyxm5lq0v8girmip1jmkdbijrmbrq7k5pp47zkhwwrq"; }) + (fetchurl { + name = "template-operators.patch"; # since gcc12 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-template-operators.patch?id=d3f0d8bb519c0af"; + sha256 = "N25Y7jXDbr0qb7MfRr2yz3zRySppgGOe+oCfNQhRvVc="; + }) ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index ab354b836b6a..4b02b11b3d23 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/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/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 54df7be6f1ba..5663652429a4 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -4,6 +4,7 @@ , cmake , netcdf , openjpeg +, libaec , libpng , gfortran , perl @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.24.2"; + version = "2.28.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-xgrQ/YnhGRis4NhMAUifISIrEdbK0/90lYVqCt1hBAM="; + sha256 = "sha256-KDE0exUXr569cN08rYiugYqESNTmyGcapyhhfnNDHNU="; }; postPatch = '' @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf openjpeg + libaec libpng ]; @@ -60,14 +62,11 @@ stdenv.mkDerivation rec { doCheck = true; # Only do tests that don't require downloading 120MB of testdata - checkPhase = lib.optionalString (stdenv.isDarwin) '' - substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" - '' + '' + checkPhase = '' ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix new file mode 100644 index 000000000000..bd61fb603f8b --- /dev/null +++ b/pkgs/development/libraries/edencommon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, cmake, fetchFromGitHub, glog, folly, fmt_8, boost, gtest }: + +stdenv.mkDerivation rec { + pname = "edencommon"; + version = "2023.01.30.00"; + + src = fetchFromGitHub { + owner = "facebookexperimental"; + repo = "edencommon"; + rev = "v${version}"; + sha256 = "sha256-N3/Ey0zrfOfuAaS6qIpEgUUL5GkCZrqpAspJ7OprLPk="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + glog + folly + fmt_8 + boost + gtest + ]; + + meta = with lib; { + description = "A shared library for Meta's source control filesystem tools (EdenFS and Watchman)"; + homepage = "https://github.com/facebookexperimental/edencommon"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index e4509d058dae..5cab69db676f 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index 08a650dbca00..5fbb03a9fa2b 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "example-robot-data"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "Gepetto"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-rxVyka8tcF/CmGTVNyh3FPR1LVa6JOAN+9zjElgqCak="; + sha256 = "sha256-5FqMRChv/YGeoZq/jLSEJI5iQazQIDwslT78fbERVfs="; }; strictDeps = true; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index d17ca4ea751e..54bab95992c0 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/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/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix new file mode 100644 index 000000000000..2df547d75f92 --- /dev/null +++ b/pkgs/development/libraries/fb303/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, glog +, folly +, fmt_8 +, boost +, fbthrift +, zlib +, fizz +, libsodium +, wangle +, python3 +}: + +stdenv.mkDerivation rec { + pname = "fb303"; + version = "2023.01.30.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "fb303"; + rev = "v${version}"; + sha256 = "sha256-k0kDaiSLaGNPhgCgksAu/qM9e4ogISQaFvWq4/mZIeI="; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DPYTHON_EXTENSIONS=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + glog + folly + fmt_8 + boost + fbthrift + zlib + fizz + libsodium + wangle + python3 + ]; + + meta = with lib; { + description = "a base Thrift service and a common set of functionality for querying stats, options, and other information from a service"; + homepage = "https://github.com/facebook/fb303"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix new file mode 100644 index 000000000000..bcaae0e60565 --- /dev/null +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, cmake +, bison +, boost +, libevent +, double-conversion +, libsodium +, fizz +, flex +, fmt_8 +, folly +, glog +, gflags +, libiberty +, openssl +, lib +, wangle +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "fbthrift"; + version = "2023.01.30.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "fbthrift"; + rev = "v${version}"; + sha256 = "sha256-poXe2EF4ZcqOZza1WUSAO2cA655jiWpqdo3YYrzAk7I="; + }; + + nativeBuildInputs = [ + cmake + bison + flex + ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + boost + double-conversion + fizz + fmt_8 + folly + glog + gflags + libevent + libiberty + openssl + wangle + zlib + zstd + libsodium + ]; + + meta = with lib; { + description = "Facebook's branch of Apache Thrift"; + homepage = "https://github.com/facebook/fbthrift"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix deleted file mode 100644 index a8acf7a7ce61..000000000000 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ /dev/null @@ -1,511 +0,0 @@ -{ lib, stdenv, buildPackages, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm -/* - * Licensing options (yes some are listed twice, filters and such are not listed) - */ -, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab -, version3Licensing ? true # (L)GPL3: libvmaf,opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc -, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,blackmagic-design-desktop-video -/* - * Build options - */ -, smallBuild ? false # Optimize for size instead of speed -, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) -, grayBuild ? true # Full grayscale support -, swscaleAlphaBuild ? true # Alpha channel support in swscale -, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation -, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders -, multithreadBuild ? true # Multithreading via pthreads/win32 threads -, networkBuild ? true # Network support -, pixelutilsBuild ? true # Pixel utils in libavutil -, enableLto ? false # build with link-time optimization -/* - * Program options - */ -, ffmpegProgram ? true # Build ffmpeg executable -, ffplayProgram ? true # Build ffplay executable -, ffprobeProgram ? true # Build ffprobe executable -, qtFaststartProgram ? true # Build qt-faststart executable -/* - * Library options - */ -, avcodecLibrary ? true # Build avcodec library -, avdeviceLibrary ? true # Build avdevice library -, avfilterLibrary ? true # Build avfilter library -, avformatLibrary ? true # Build avformat library -, avutilLibrary ? true # Build avutil library -, postprocLibrary ? true # Build postproc library -, swresampleLibrary ? true # Build swresample library -, swscaleLibrary ? true # Build swscale library -/* - * Documentation options - */ -, htmlpagesDocumentation ? false # HTML documentation pages -, manpagesDocumentation ? true # Man documentation pages -, podpagesDocumentation ? false # POD documentation pages -, txtpagesDocumentation ? false # Text documentation pages -/* - * External libraries options - */ -, alsa-lib ? null # Alsa in/output support -#, avisynth ? null # Support for reading AviSynth scripts -, bzip2 ? null -, clang ? null -, celt ? null # CELT decoder -#, crystalhd ? null # Broadcom CrystalHD hardware acceleration -, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA -, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation -, dav1d ? null # AV1 decoder (focused on speed and correctness) -#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support -, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder -#, flite ? null # Flite (voice synthesis) support -, fontconfig ? null # Needed for drawtext filter -, freetype ? null # Needed for drawtext filter -, frei0r ? null # frei0r video filtering -, fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator -, gnutls ? null -, gsm ? null # GSM de/encoder -#, ilbc ? null # iLBC de/encoder -, libjack2 ? null # Jack audio (only version 2 is supported in this build) -, ladspaH ? null # LADSPA audio filtering -, lame ? null # LAME MP3 encoder -, libass ? null # (Advanced) SubStation Alpha subtitle rendering -, libaom ? null # AV1 encoder -, libbluray ? null # BluRay reading -, libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) -#, libcdio-paranoia ? null # Audio CD grabbing -, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) -, libdrm ? null # libdrm support -, libiconv ? null -#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -, libmfx ? null # Hardware acceleration vis libmfx -, libmodplug ? null # ModPlug support -, libmysofa ? null # HRTF support via SOFAlizer -#, libnut ? null # NUT (de)muxer, native (de)muser exists -, libogg ? null # Ogg container used by vorbis & theora -, libopenmpt ? null # Tracked music files decoder -, libopus ? null # Opus de/encoder -, librsvg ? null # SVG protocol -, libssh ? null # SFTP protocol -, libtheora ? null # Theora encoder -, libv4l ? null # Video 4 Linux support -, libva ? null # Vaapi hardware acceleration -, libvdpau ? null # Vdpau hardware acceleration -, libvmaf ? null # Netflix's VMAF (Video Multi-Method Assessment Fusion) -, libvorbis ? null # Vorbis de/encoding, native encoder exists -, libvpx ? null # VP8 & VP9 de/encoding -, libwebp ? null # WebP encoder -, libX11 ? null # Xlib support -, libxcb ? null # X11 grabbing using XCB -, libxcbshmExtlib ? true # X11 grabbing shm communication -, libxcbxfixesExtlib ? true # X11 grabbing mouse rendering -, libxcbshapeExtlib ? true # X11 grabbing shape rendering -, libXv ? null # Xlib support -, libXext ? null # Xlib support -, libxml2 ? null # libxml2 support, for IMF and DASH demuxers -, xz ? null # xz-utils -, nv-codec-headers ? null -, nvdec ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVDEC support -, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support -, ocl-icd ? null # OpenCL ICD -, opencl-headers ? null # OpenCL headers -, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -#, opencv ? null # Video filtering -, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering -, openh264 ? null # H.264/AVC encoder -, openjpeg ? null # JPEG 2000 de/encoder -, opensslExtlib ? false, openssl ? null -, libpulseaudio ? null # Pulseaudio input support -, rav1e ? null # AV1 encoder (focused on speed and safety) -, svt-av1 ? null # AV1 encoder/decoder (focused on speed and correctness) -, rtmpdump ? null # RTMP[E] support -#, libquvi ? null # Quvi input support -, samba ? null # Samba protocol -#, schroedinger ? null # Dirac de/encoder -, SDL2 ? null -#, shine ? null # Fixed-point MP3 encoder -, soxr ? null # Resampling via soxr -, speex ? null # Speex de/encoder -, srt ? null # Secure Reliable Transport (SRT) protocol -#, twolame ? null # MP2 encoder -#, utvideo ? null # Ut Video de/encoder -, vid-stab ? null # Video stabilization -#, vo-aacenc ? null # AAC encoder -, vo-amrwbenc ? null # AMR-WB encoder -, x264 ? null # H.264/AVC encoder -, x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder -, xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing -, zimg ? null -, zlib ? null -, vulkan-loader ? null -, glslang ? null -#, zvbi ? null # Teletext support -/* - * Developer options - */ -, debugDeveloper ? false -, optimizationsDeveloper ? true -, extraWarningsDeveloper ? false -, strippingDeveloper ? false -/* - * Darwin frameworks - */ -, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, VideoToolbox -}: - -/* Maintainer notes: - * - * Version bumps: - * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) - * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed - * and make the necessary changes. - * - * Packages with errors: - * flite ilbc schroedinger - * opencv - circular dependency issue - * - * Not packaged: - * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc oss shine twolame - * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video - * - * Need fixes to support Darwin: - * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba - * vid-stab - * - * Need fixes to support AArch64: - * libmfx(intel-media-sdk) nvenc - * - * Not supported: - * stagefright-h264(android only) - * - * Known issues: - * flite: configure fails to find library - * Tried modifying ffmpeg's configure script and flite to use pkg-config - * Cross-compiling will disable features not present on host OS - * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) - * - */ - -let - inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; - inherit (lib) optional optionals optionalString enableFeature; -in - -/* - * Licensing dependencies - */ -assert version3Licensing -> gplLicensing; -assert nonfreeLicensing -> gplLicensing && version3Licensing; -/* - * Build dependencies - */ -assert networkBuild -> gnutls != null || opensslExtlib; -assert pixelutilsBuild -> avutilLibrary; -/* - * Platform dependencies - */ -assert isDarwin -> !nvenc; -/* - * Program dependencies - */ -assert ffmpegProgram -> avcodecLibrary - && avfilterLibrary - && avformatLibrary - && swresampleLibrary; -assert ffplayProgram -> avcodecLibrary - && avformatLibrary - && swscaleLibrary - && swresampleLibrary - && SDL2 != null; -assert ffprobeProgram -> avcodecLibrary && avformatLibrary; -/* - * Library dependencies - */ -assert avcodecLibrary -> avutilLibrary; # configure flag since 0.6 -assert avdeviceLibrary -> avformatLibrary - && avcodecLibrary - && avutilLibrary; # configure flag since 0.6 -assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert postprocLibrary -> avutilLibrary; -assert swresampleLibrary -> soxr != null; -assert swscaleLibrary -> avutilLibrary; -/* - * External libraries - */ -#assert decklinkExtlib -> blackmagic-design-desktop-video != null -# && !isCygwin && multithreadBuild # POSIX threads required -# && nonfreeLicensing; -assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing; -assert gnutls != null -> !opensslExtlib; -assert libxcbshmExtlib -> libxcb != null; -assert libxcbxfixesExtlib -> libxcb != null; -assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> libGL != null && libGLU != null; -assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; - -stdenv.mkDerivation rec { - pname = "ffmpeg-full"; - inherit (ffmpeg) src version patches; - - prePatch = '' - patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c - '' + lib.optionalString (frei0r != null) '' - substituteInPlace libavfilter/vf_frei0r.c \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - substituteInPlace doc/filters.texi \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - ''; - - configurePlatforms = []; - configureFlags = [ - "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" #mingw32 and mingw64 doesn't have a difference here, it is internally rewritten as mingw32 - "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - /* - * Licensing flags - */ - (enableFeature gplLicensing "gpl") - (enableFeature version3Licensing "version3") - (enableFeature nonfreeLicensing "nonfree") - /* - * Build flags - */ - # On some ARM platforms --enable-thumb - "--enable-shared" - (enableFeature true "pic") - (enableFeature smallBuild "small") - (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") - (enableFeature enableLto "lto") - (enableFeature grayBuild "gray") - (enableFeature swscaleAlphaBuild "swscale-alpha") - (enableFeature hardcodedTablesBuild "hardcoded-tables") - (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") - (if multithreadBuild then ( - if stdenv.hostPlatform.isWindows then - "--disable-pthreads --enable-w32threads" - else # Use POSIX threads by default - "--enable-pthreads --disable-w32threads") - else - "--disable-pthreads --disable-w32threads") - "--disable-os2threads" # We don't support OS/2 - (enableFeature networkBuild "network") - (enableFeature pixelutilsBuild "pixelutils") - /* - * Program flags - */ - (enableFeature ffmpegProgram "ffmpeg") - (enableFeature ffplayProgram "ffplay") - (enableFeature ffprobeProgram "ffprobe") - /* - * Library flags - */ - (enableFeature avcodecLibrary "avcodec") - (enableFeature avdeviceLibrary "avdevice") - (enableFeature avfilterLibrary "avfilter") - (enableFeature avformatLibrary "avformat") - (enableFeature avutilLibrary "avutil") - (enableFeature (postprocLibrary && gplLicensing) "postproc") - (enableFeature swresampleLibrary "swresample") - (enableFeature swscaleLibrary "swscale") - /* - * Documentation flags - */ - (enableFeature (htmlpagesDocumentation - || manpagesDocumentation - || podpagesDocumentation - || txtpagesDocumentation) "doc") - (enableFeature htmlpagesDocumentation "htmlpages") - (enableFeature manpagesDocumentation "manpages") - (enableFeature podpagesDocumentation "podpages") - (enableFeature txtpagesDocumentation "txtpages") - /* - * External libraries - */ - #(enableFeature avisynth "avisynth") - (enableFeature (bzip2 != null) "bzlib") - (enableFeature (celt != null) "libcelt") - (enableFeature cuda "cuda") - (enableFeature (clang != null && cuda-llvm) "cuda-llvm") - #(enableFeature crystalhd "crystalhd") - (enableFeature (dav1d != null) "libdav1d") - #(enableFeature decklinkExtlib "decklink") - (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") - #(enableFeature (flite != null) "libflite") - "--disable-libflite" # Force disable until a solution is found - (enableFeature (fontconfig != null) "fontconfig") - (enableFeature (freetype != null) "libfreetype") - (enableFeature (frei0r != null && gplLicensing) "frei0r") - (enableFeature (fribidi != null) "libfribidi") - (enableFeature (game-music-emu != null) "libgme") - (enableFeature (gnutls != null) "gnutls") - (enableFeature (gsm != null) "libgsm") - #(enableFeature (ilbc != null) "libilbc") - (enableFeature (ladspaH !=null) "ladspa") - (enableFeature (lame != null) "libmp3lame") - (enableFeature (libaom != null) "libaom") - (enableFeature (libass != null) "libass") - #(enableFeature (libavc1394 != null) null null) - (enableFeature (libbluray != null) "libbluray") - (enableFeature (libbs2b != null) "libbs2b") - #(enableFeature (libcaca != null) "libcaca") - #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") - (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") - (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") - (enableFeature (libiconv != null) "iconv") - (enableFeature (libjack2 != null) "libjack") - #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - (enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx") - (enableFeature (libmodplug != null) "libmodplug") - (enableFeature (libmysofa != null) "libmysofa") - #(enableFeature (libnut != null) "libnut") - (enableFeature (libopenmpt != null) "libopenmpt") - (enableFeature (libopus != null) "libopus") - (enableFeature (librsvg != null) "librsvg") - (enableFeature (srt != null) "libsrt") - (enableFeature (libssh != null) "libssh") - (enableFeature (libtheora != null) "libtheora") - (enableFeature (if isLinux then libv4l != null else false) "libv4l2") - (enableFeature ((isLinux || isFreeBSD) && libva != null) "vaapi") - (enableFeature (libvdpau != null) "vdpau") - (enableFeature (libvorbis != null) "libvorbis") - (enableFeature (!isAarch64 && libvmaf != null && version3Licensing) "libvmaf") - (enableFeature (libvpx != null) "libvpx") - (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") - (enableFeature (libxcb != null) "libxcb") - (enableFeature libxcbshmExtlib "libxcb-shm") - (enableFeature libxcbxfixesExtlib "libxcb-xfixes") - (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (libxml2 != null) "libxml2") - (enableFeature (xz != null) "lzma") - (enableFeature nvdec "cuvid") - (enableFeature nvdec "nvdec") - (enableFeature nvenc "nvenc") - (enableFeature (openal != null) "openal") - (enableFeature (ocl-icd != null && opencl-headers != null) "opencl") - (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") - #(enableFeature (opencv != null) "libopencv") - (enableFeature openglExtlib "opengl") - (enableFeature (openh264 != null) "libopenh264") - (enableFeature (openjpeg != null) "libopenjpeg") - (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (libpulseaudio != null) "libpulse") - #(enableFeature quvi "libquvi") - (enableFeature (rav1e != null) "librav1e") - (enableFeature (svt-av1 != null) "libsvtav1") - (enableFeature (rtmpdump != null) "librtmp") - #(enableFeature (schroedinger != null) "libschroedinger") - (enableFeature (SDL2 != null) "sdl2") - (enableFeature (soxr != null) "libsoxr") - (enableFeature (speex != null) "libspeex") - #(enableFeature (twolame != null) "libtwolame") - #(enableFeature (utvideo != null && gplLicensing) "libutvideo") - (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 - #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") - (enableFeature (x264 != null && gplLicensing) "libx264") - (enableFeature (x265 != null && gplLicensing) "libx265") - (enableFeature (xavs != null && gplLicensing) "libxavs") - (enableFeature (xvidcore != null && gplLicensing) "libxvid") - (enableFeature (zeromq4 != null) "libzmq") - (enableFeature (zimg != null) "libzimg") - (enableFeature (zlib != null) "zlib") - (enableFeature (isLinux && vulkan-loader != null) "vulkan") - (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") - (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") - #(enableFeature (zvbi != null && gplLicensing) "libzvbi") - /* - * Developer flags - */ - (enableFeature debugDeveloper "debug") - (enableFeature optimizationsDeveloper "optimizations") - (enableFeature extraWarningsDeveloper "extra-warnings") - (enableFeature strippingDeveloper "stripping") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--host-cc=${buildPackages.stdenv.cc}/bin/cc" - ] ++ optionals stdenv.cc.isClang [ - "--cc=clang" - "--cxx=clang++" - ]; - - nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; - - buildInputs = [ - bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm - libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa - libogg libopenmpt libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr - samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore - zeromq4 zimg zlib openh264 - ] ++ optionals openglExtlib [ libGL libGLU ] - ++ optionals nonfreeLicensing [ fdk_aac openssl ] - ++ optional ((isLinux || isFreeBSD) && libva != null) libva - ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm - ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] - ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx - ++ optional (nvdec || nvenc) nv-codec-headers - ++ optional cuda-llvm clang - ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration VideoToolbox - libiconv ]; - - buildFlags = [ "all" ] - ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable - - doCheck = true; - checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES - ''; - - # Hacky framework patching technique borrowed from the phantomjs2 package - postInstall = optionalString qtFaststartProgram '' - cp -a tools/qt-faststart $out/bin/ - ''; - - postFixup = optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/libavcodec.so - addOpenGLRunpath $out/lib/libavutil.so - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = "https://www.ffmpeg.org/"; - changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; - longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. - ''; - license = ( - if nonfreeLicensing then - licenses.unfreeRedistributable - else if version3Licensing then - licenses.gpl3 - else if gplLicensing then - licenses.gpl2Plus - else - licenses.lgpl21Plus - ); - platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index ac88df930768..7882c19da8f3 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,8 +1,4 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix (rec { +import ./generic.nix rec { version = "4.4.3"; - branch = version; - sha256 = "sha256-M7jC281TD+HbVxBBU0Vgm0yiJ70NoeOpMy27DxH9Jzo="; - -} // args) + sha256 = "sha256-zZDzG1hD+0AHqElzeGR6OVm+H5wqtdktloSPmEUzT/c="; +} diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index b19c22a55f3a..7ff9b1fc2e4c 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -1,7 +1,4 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix (rec { +import ./generic.nix rec { version = "5.1.2"; - branch = version; - sha256 = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys="; -} // args) + sha256 = "sha256-4jcfwIE0/DgP7ibwkrSm/aPiHIMFn34JNcXkCMx4ceI="; +} diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 01995e9237b1..d0374c74901e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,205 +1,666 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm -, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, xz, soxr -, x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d -, vpxSupport ? !stdenv.isAarch32, libvpx -, srtSupport ? true, srt -, vaapiSupport ? ((stdenv.isLinux || stdenv.isFreeBSD) && !stdenv.isAarch32) -, openglSupport ? false, libGLU, libGL -, libmfxSupport ? false, intel-media-sdk -, libaomSupport ? false, libaom -# Build options -, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime -, multithreadBuild ? true # Multithreading via pthreads/win32 threads -, sdlSupport ? !stdenv.isAarch32, SDL2 -, vdpauSupport ? !stdenv.isAarch32, libvdpau -# Developer options -, debugDeveloper ? false -, optimizationsDeveloper ? true -, extraWarningsDeveloper ? false -, Cocoa, CoreMedia, VideoToolbox -# Inherit generics -, branch, sha256, version, patches ? [], knownVulnerabilities ? [] -, doCheck ? true -, pulseaudioSupport ? stdenv.isLinux +{ version, sha256, extraPatches ? [], knownVulnerabilities ? [] }: + +{ lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm + +, ffmpegVariant ? "small" # Decides which dependencies are enabled by default + + # Build with headless deps; excludes dependencies that are only necessary for + # GUI applications. To be used for purposes that don't generally need such + # components and i.e. only depend on libav +, withHeadlessDeps ? ffmpegVariant == "headless" || withSmallDeps + + # Dependencies a user might customarily expect from a regular ffmpeg build. + # /All/ packages that depend on ffmpeg and some of its feaures should depend + # on the small variant. Small means the minimal set of features that satisfies + # all dependants in Nixpkgs +, withSmallDeps ? ffmpegVariant == "small" || withFullDeps + + # Everything enabled; only guarded behind platform exclusivity or brokeness. + # If you need to depend on ffmpeg-full because ffmpeg is missing some feature + # your package needs, you should enable that feature in regular ffmpeg + # instead. +, withFullDeps ? ffmpegVariant == "full" + +, fetchgit +, fetchpatch + + # Feature flags +, withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT +, withAom ? withFullDeps # AV1 reference encoder +, withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering +, withBluray ? withFullDeps # BluRay reading +, withBs2b ? withFullDeps # bs2b DSP library +, withBzlib ? withHeadlessDeps +, withCaca ? withFullDeps # Textual display (ASCII art) +, withCelt ? withFullDeps # CELT decoder +, withCrystalhd ? withFullDeps +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64)) +, withCudaLLVM ? withFullDeps +, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) +, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) +, withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support +, withFdkAac ? withFullDeps && withUnfree # Fraunhofer FDK AAC de/encoder +, withFontconfig ? withHeadlessDeps # Needed for drawtext filter +, withFreetype ? withHeadlessDeps # Needed for drawtext filter +, withFrei0r ? withFullDeps # frei0r video filtering +, withFribidi ? withFullDeps # Needed for drawtext filter +, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGme ? withFullDeps # Game Music Emulator +, withGnutls ? withHeadlessDeps +, withGsm ? withFullDeps # GSM de/encoder +, withIconv ? withHeadlessDeps +, withIlbc ? withFullDeps +, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withLadspa ? withFullDeps # LADSPA audio filtering +, withLzma ? withHeadlessDeps # xz-utils +, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support +, withMp3lame ? withHeadlessDeps # LAME MP3 encoder +, withMysofa ? withFullDeps # HRTF support via SOFAlizer +, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform +, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform +, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora +, withOpenal ? withFullDeps # OpenAL 1.1 capture support +, withOpencl ? withFullDeps +, withOpencoreAmrnb ? withFullDeps # AMR-NB de/encoder & AMR-WB decoder +, withOpengl ? false # OpenGL rendering +, withOpenh264 ? withFullDeps # H.264/AVC encoder +, withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder +, withOpenmpt ? withFullDeps # Tracked music files decoder +, withOpus ? withHeadlessDeps # Opus de/encoder +, withPulse ? withSmallDeps && !stdenv.isDarwin # Pulseaudio input support +, withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) +, withRtmp ? false # RTMP[E] support +, withSamba ? withFullDeps && !stdenv.isDarwin # Samba protocol +, withSdl2 ? withSmallDeps +, withSoxr ? withHeadlessDeps # Resampling via soxr +, withSpeex ? withHeadlessDeps # Speex de/encoder +, withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol +, withSsh ? withHeadlessDeps # SFTP protocol +, withSvg ? withFullDeps # SVG protocol +, withSvtav1 ? withFullDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) +, withTheora ? withHeadlessDeps # Theora encoder +, withV4l2 ? withFullDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2M2m ? withV4l2 +, withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration +, withVdpau ? withSmallDeps # Vdpau hardware acceleration +, withVidStab ? withFullDeps # Video stabilization +, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVoAmrwbenc ? withFullDeps # AMR-WB encoder +, withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists +, withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding +, withVulkan ? withFullDeps && !stdenv.isDarwin +, withWebp ? withFullDeps # WebP encoder +, withX264 ? withHeadlessDeps # H.264/AVC encoder +, withX265 ? withHeadlessDeps # H.265/HEVC encoder +, withXavs ? withFullDeps # AVS encoder +, withXcb ? withXcbShm || withXcbxfixes || withXcbShape # X11 grabbing using XCB +, withXcbShape ? withFullDeps # X11 grabbing shape rendering +, withXcbShm ? withFullDeps # X11 grabbing shm communication +, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering +, withXlib ? withFullDeps # Xlib support +, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers +, withXvid ? withHeadlessDeps # Xvid encoder, native encoder exists +, withZimg ? withHeadlessDeps +, withZlib ? withHeadlessDeps +, withZmq ? withFullDeps # Message passing + +/* + * Licensing options (yes some are listed twice, filters and such are not listed) + */ +, withGPL ? true +, withGPLv3 ? true +, withUnfree ? false + +/* + * Build options + */ +, withSmallBuild ? false # Optimize for size instead of speed +, withRuntimeCPUDetection ? true # Detect CPU capabilities at runtime (disable to compile natively) +, withGrayscale ? withFullDeps # Full grayscale support +, withSwscaleAlpha ? buildSwscale # Alpha channel support in swscale. You probably want this when buildSwscale. +, withHardcodedTables ? withHeadlessDeps # Hardcode decode tables instead of runtime generation +, withSafeBitstreamReader ? withHeadlessDeps # Buffer boundary checking in bitreaders +, withMultithread ? true # Multithreading via pthreads/win32 threads +, withNetwork ? withHeadlessDeps # Network support +, withPixelutils ? withHeadlessDeps # Pixel utils in libavutil +, withLTO ? false # build with link-time optimization +/* + * Program options + */ +, buildFfmpeg ? withHeadlessDeps # Build ffmpeg executable +, buildFfplay ? withFullDeps # Build ffplay executable +, buildFfprobe ? withHeadlessDeps # Build ffprobe executable +, buildQtFaststart ? withFullDeps # Build qt-faststart executable +, withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart +/* + * Library options + */ +, buildAvcodec ? withHeadlessDeps # Build avcodec library +, buildAvdevice ? withHeadlessDeps # Build avdevice library +, buildAvfilter ? withHeadlessDeps # Build avfilter library +, buildAvformat ? withHeadlessDeps # Build avformat library +# Deprecated but depended upon by some packages. +# https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991) +, buildAvresample ? withHeadlessDeps && lib.versionOlder version "5" # Build avresample library +, buildAvutil ? withHeadlessDeps # Build avutil library +, buildPostproc ? withHeadlessDeps # Build postproc library +, buildSwresample ? withHeadlessDeps # Build swresample library +, buildSwscale ? withHeadlessDeps # Build swscale library +, withLib ? buildAvcodec + || buildAvdevice + || buildAvfilter + || buildAvformat + || buildAvutil + || buildPostproc + || buildSwresample + || buildSwscale +/* + * Documentation options + */ +, withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc +, withHtmlDoc ? withHeadlessDeps # HTML documentation pages +, withManPages ? withHeadlessDeps # Man documentation pages +, withPodDoc ? withHeadlessDeps # POD documentation pages +, withTxtDoc ? withHeadlessDeps # Text documentation pages +# Whether a "doc" output will be produced. Note that withManPages does not produce +# a "doc" output because its files go to "man". +, withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc) + +/* + * Developer options + */ +, withDebug ? false +, withOptimisations ? true +, withExtraWarnings ? false +, withStripping ? false + +/* + * External libraries options + */ +, alsa-lib +, bzip2 +, clang +, celt +, dav1d +, fdk_aac +, fontconfig +, freetype +, frei0r +, fribidi +, game-music-emu +, gnutls +, gsm +, libjack2 +, ladspaH +, lame +, libass +, libaom +, libbluray +, libbs2b +, libcaca +, libdc1394 +, libraw1394 +, libdrm +, libiconv +, intel-media-sdk +, libmodplug +, libmysofa +, libogg +, libopenmpt +, libopus +, librsvg +, libssh +, libtheora +, libv4l +, libva +, libva-minimal +, libvdpau +, libvmaf +, libvorbis +, libvpx +, libwebp +, libX11 +, libxcb +, libXv +, libXext +, libxml2 +, xz +, nv-codec-headers +, openal +, ocl-icd # OpenCL ICD +, opencl-headers # OpenCL headers +, opencore-amr +, libGL +, libGLU +, openh264 +, openjpeg , libpulseaudio -, ... +, rav1e +, svt-av1 +, rtmpdump +, samba +, SDL2 +, soxr +, speex +, srt +, vid-stab +, vo-amrwbenc +, x264 +, x265 +, xavs +, xvidcore +, zeromq4 +, zimg +, zlib +, vulkan-loader +, glslang +/* + * Darwin frameworks + */ +, AVFoundation +, Cocoa +, CoreAudio +, CoreMedia +, CoreServices +, MediaToolbox +, VideoDecodeAcceleration +, VideoToolbox +/* + * Testing + */ +, testers }: /* Maintainer notes: * - * THIS IS A MINIMAL BUILD OF FFMPEG, do not include dependencies unless - * a build that depends on ffmpeg requires them to be compiled into ffmpeg, - * see `ffmpeg-full' for an ffmpeg build with all features included. - * - * Need fixes to support Darwin: - * pulseaudio + * Version bumps: + * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) + * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed + * and make the necessary changes. * * Known issues: - * ALL - Cross-compiling will disable features not present on host OS - * (e.g. dxva2 support [DirectX] will not be enabled unless natively - * compiled on Cygwin) + * Cross-compiling will disable features not present on host OS + * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) * */ let - inherit (lib) optional optionals optionalString enableFeature filter; - - reqMin = requiredVersion: (builtins.compareVersions requiredVersion branch != 1); - - ifMinVer = minVer: flag: if reqMin minVer then flag else null; - - ifVerOlder = maxVer: flag: if (lib.versionOlder branch maxVer) then flag else null; + inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; + inherit (lib) optional optionals optionalString enableFeature; in -stdenv.mkDerivation rec { - pname = "ffmpeg"; + +assert lib.elem ffmpegVariant [ "headless" "small" "full" ]; + +/* + * Licensing dependencies + */ +assert withGPLv3 -> withGPL; +assert withUnfree -> withGPL && withGPLv3; +/* + * Build dependencies + */ +assert withPixelutils -> buildAvutil; +/* + * Program dependencies + */ +assert buildFfmpeg -> buildAvcodec + && buildAvfilter + && buildAvformat + && (buildSwresample || buildAvresample); +assert buildFfplay -> buildAvcodec + && buildAvformat + && buildSwscale + && (buildSwresample || buildAvresample); +assert buildFfprobe -> buildAvcodec && buildAvformat; +/* + * Library dependencies + */ +assert buildAvcodec -> buildAvutil; # configure flag since 0.6 +assert buildAvdevice -> buildAvformat + && buildAvcodec + && buildAvutil; # configure flag since 0.6 +assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6 +assert buildPostproc -> buildAvutil; +assert buildSwscale -> buildAvutil; + +stdenv.mkDerivation (finalAttrs: { + pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}"); inherit version; - src = fetchurl { - url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2"; + src = fetchgit { + url = "https://git.ffmpeg.org/ffmpeg.git"; + rev = "n${finalAttrs.version}"; inherit sha256; }; - postPatch = "patchShebangs ."; - inherit patches; - - outputs = [ "bin" "dev" "out" "man" "doc" ]; - setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! - - configurePlatforms = []; - configureFlags = filter (v: v != null) ([ - "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" - "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config" - # License - "--enable-gpl" - "--enable-version3" - # Build flags - "--enable-shared" - "--enable-pic" - (ifMinVer "4.0" (enableFeature srtSupport "libsrt")) - (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") - "--enable-hardcoded-tables" - ] ++ - (if multithreadBuild then ( - if stdenv.isCygwin then - ["--disable-pthreads" "--enable-w32threads"] - else # Use POSIX threads by default - ["--enable-pthreads" "--disable-w32threads"]) - else - ["--disable-pthreads" "--disable-w32threads"]) - ++ [ - "--disable-os2threads" # We don't support OS/2 - "--enable-network" - "--enable-pixelutils" - # Executables - "--enable-ffmpeg" - "--disable-ffplay" - "--enable-ffprobe" - (ifVerOlder "4" "--disable-ffserver") - # Libraries - "--enable-avcodec" - "--enable-avdevice" - "--enable-avfilter" - "--enable-avformat" - (ifVerOlder "5.0" "--enable-avresample") - "--enable-avutil" - "--enable-postproc" - "--enable-swresample" - "--enable-swscale" - # Docs - "--disable-doc" - # External Libraries - "--enable-libass" - "--enable-bzlib" - "--enable-gnutls" - "--enable-fontconfig" - "--enable-libfreetype" - "--enable-libmp3lame" - "--enable-iconv" - "--enable-libtheora" - "--enable-libssh" - (enableFeature vaapiSupport "vaapi") - (enableFeature vaapiSupport "libdrm") - (enableFeature vdpauSupport "vdpau") - "--enable-libvorbis" - (enableFeature vpxSupport "libvpx") - "--enable-lzma" - (enableFeature openglSupport "opengl") - (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx")) - (ifMinVer "4.2" (enableFeature libaomSupport "libaom")) - (lib.optionalString pulseaudioSupport "--enable-libpulse") - (enableFeature sdlSupport "sdl2") - "--enable-libsoxr" - "--enable-libx264" - "--enable-libxvid" - "--enable-libzimg" - "--enable-zlib" - "--enable-libopus" - "--enable-libspeex" - "--enable-libx265" - (ifMinVer "4.2" (enableFeature (reqMin "4.2") "libdav1d")) - # Developer flags - (enableFeature debugDeveloper "debug") - (enableFeature optimizationsDeveloper "optimizations") - (enableFeature extraWarningsDeveloper "extra-warnings") - "--disable-stripping" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - ] ++ optional stdenv.cc.isClang "--cc=clang"); - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; - - buildInputs = [ - bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis xz soxr x264 x265 xvidcore zimg zlib libopus speex nv-codec-headers - ] ++ optionals openglSupport [ libGL libGLU ] - ++ optional libmfxSupport intel-media-sdk - ++ optional libaomSupport libaom - ++ optional vpxSupport libvpx - ++ optionals (!stdenv.isDarwin && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin - ++ optionals vaapiSupport [ libva libdrm ] - ++ optional stdenv.isLinux alsa-lib - ++ optionals stdenv.isDarwin [ Cocoa CoreMedia VideoToolbox ] - ++ optional vdpauSupport libvdpau - ++ optional sdlSupport SDL2 - ++ optional srtSupport srt - ++ optional (reqMin "4.2") dav1d; - - enableParallelBuilding = true; - - inherit doCheck; - checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES + postPatch = '' + patchShebangs . + '' + lib.optionalString withFrei0r '' + substituteInPlace libavfilter/vf_frei0r.c \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + substituteInPlace doc/filters.texi \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; - # ffmpeg 3+ generates pkg-config (.pc) files that don't have the - # form automatically handled by the multiple-outputs hooks. - postFixup = '' - moveToOutput bin "$bin" - moveToOutput share/ffmpeg/examples "$doc" - for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do - substituteInPlace $pc \ - --replace "includedir=$out" "includedir=''${!outputInclude}" - done - '' + optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + patches = map (patch: fetchpatch patch) extraPatches; + + configurePlatforms = []; + setOutputFlags = false; # Only accepts some of them + configureFlags = [ + #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here + "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" + "--arch=${stdenv.hostPlatform.parsed.cpu.name}" + "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config" + /* + * Licensing flags + */ + (enableFeature withGPL "gpl") + (enableFeature withGPLv3 "version3") + (enableFeature withUnfree "nonfree") + /* + * Build flags + */ + # On some ARM platforms --enable-thumb + "--enable-shared" + "--enable-pic" + + (enableFeature withSmallBuild "small") + (enableFeature withRuntimeCPUDetection "runtime-cpudetect") + (enableFeature withLTO "lto") + (enableFeature withGrayscale "gray") + (enableFeature withSwscaleAlpha "swscale-alpha") + (enableFeature withHardcodedTables "hardcoded-tables") + (enableFeature withSafeBitstreamReader "safe-bitstream-reader") + + (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + "--disable-os2threads" # We don't support OS/2 + + (enableFeature withNetwork "network") + (enableFeature withPixelutils "pixelutils") + + "--datadir=${placeholder "data"}/share/ffmpeg" + + /* + * Program flags + */ + (enableFeature buildFfmpeg "ffmpeg") + (enableFeature buildFfplay "ffplay") + (enableFeature buildFfprobe "ffprobe") + ] ++ optionals withBin [ + "--bindir=${placeholder "bin"}/bin" + ] ++ [ + /* + * Library flags + */ + (enableFeature buildAvcodec "avcodec") + (enableFeature buildAvdevice "avdevice") + (enableFeature buildAvfilter "avfilter") + (enableFeature buildAvformat "avformat") + ] ++ optionals (lib.versionOlder version "5") [ + # Ffmpeg > 4 doesn't know about the flag anymore + (enableFeature buildAvresample "avresample") + ] ++ [ + (enableFeature buildAvutil "avutil") + (enableFeature (buildPostproc && withGPL) "postproc") + (enableFeature buildSwresample "swresample") + (enableFeature buildSwscale "swscale") + ] ++ optionals withLib [ + "--libdir=${placeholder "lib"}/lib" + "--incdir=${placeholder "dev"}/include" + ] ++ [ + /* + * Documentation flags + */ + (enableFeature withDocumentation "doc") + (enableFeature withHtmlDoc "htmlpages") + (enableFeature withManPages "manpages") + ] ++ optionals withManPages [ + "--mandir=${placeholder "man"}/share/man" + ] ++ [ + (enableFeature withPodDoc "podpages") + (enableFeature withTxtDoc "txtpages") + ] ++ optionals withDoc [ + "--docdir=${placeholder "doc"}/share/doc/ffmpeg" + ] ++ [ + /* + * External libraries + */ + (enableFeature withAlsa "alsa") + (enableFeature withBzlib "bzlib") + (enableFeature withCelt "libcelt") + (enableFeature withCuda "cuda") + (enableFeature withCudaLLVM "cuda-llvm") + (enableFeature withDav1d "libdav1d") + (enableFeature withFdkAac "libfdk-aac") + "--disable-libflite" # Force disable until a solution is found + (enableFeature withFontconfig "fontconfig") + (enableFeature withFreetype "libfreetype") + (enableFeature withFrei0r "frei0r") + (enableFeature withFribidi "libfribidi") + (enableFeature withGme "libgme") + (enableFeature withGnutls "gnutls") + (enableFeature withGsm "libgsm") + (enableFeature withLadspa "ladspa") + (enableFeature withMp3lame "libmp3lame") + (enableFeature withAom "libaom") + (enableFeature withAss "libass") + (enableFeature withBluray "libbluray") + (enableFeature withBs2b "libbs2b") + (enableFeature withDc1394 "libdc1394") + (enableFeature withDrm "libdrm") + (enableFeature withIconv "iconv") + (enableFeature withJack "libjack") + (enableFeature withMfx "libmfx") + (enableFeature withModplug "libmodplug") + (enableFeature withMysofa "libmysofa") + (enableFeature withOpus "libopus") + (enableFeature withSvg "librsvg") + (enableFeature withSrt "libsrt") + (enableFeature withSsh "libssh") + (enableFeature withTheora "libtheora") + (enableFeature withV4l2 "libv4l2") + (enableFeature withV4l2M2m "v4l2-m2m") + (enableFeature withVaapi "vaapi") + (enableFeature withVdpau "vdpau") + (enableFeature withVorbis "libvorbis") + (enableFeature withVmaf "libvmaf") + (enableFeature withVpx "libvpx") + (enableFeature withWebp "libwebp") + (enableFeature withXlib "xlib") + (enableFeature withXcb "libxcb") + (enableFeature withXcbShm "libxcb-shm") + (enableFeature withXcbxfixes "libxcb-xfixes") + (enableFeature withXcbShape "libxcb-shape") + (enableFeature withXml2 "libxml2") + (enableFeature withLzma "lzma") + (enableFeature withNvdec "cuvid") + (enableFeature withNvdec "nvdec") + (enableFeature withNvenc "nvenc") + (enableFeature withOpenal "openal") + (enableFeature withOpencl "opencl") + (enableFeature withOpencoreAmrnb "libopencore-amrnb") + (enableFeature withOpengl "opengl") + (enableFeature withOpenh264 "libopenh264") + (enableFeature withOpenjpeg "libopenjpeg") + (enableFeature withOpenmpt "libopenmpt") + (enableFeature withPulse "libpulse") + (enableFeature withRav1e "librav1e") + (enableFeature withSvtav1 "libsvtav1") + (enableFeature withRtmp "librtmp") + (enableFeature withSdl2 "sdl2") + (enableFeature withSoxr "libsoxr") + (enableFeature withSpeex "libspeex") + (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 + (enableFeature withVoAmrwbenc "libvo-amrwbenc") + (enableFeature withX264 "libx264") + (enableFeature withX265 "libx265") + (enableFeature withXavs "libxavs") + (enableFeature withXvid "libxvid") + (enableFeature withZmq "libzmq") + (enableFeature withZimg "libzimg") + (enableFeature withZlib "zlib") + (enableFeature withVulkan "vulkan") + (enableFeature withGlslang "libglslang") + (enableFeature withSamba "libsmbclient") + /* + * Developer flags + */ + (enableFeature withDebug "debug") + (enableFeature withOptimisations "optimizations") + (enableFeature withExtraWarnings "extra-warnings") + (enableFeature withStripping "stripping") + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" + "--host-cc=${buildPackages.stdenv.cc}/bin/cc" + ] ++ optionals stdenv.cc.isClang [ + "--cc=clang" + "--cxx=clang++" + ]; + + # ffmpeg embeds the configureFlags verbatim in its binaries and because we + # configure binary, include, library dir etc., this causes references in + # outputs where we don't want them. Patch the generated config.h to remove all + # such references except for data. + postConfigure = let + toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. + in + "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; + + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + + # TODO This was always in buildInputs before, why? + buildInputs = optionals withFullDeps [ libdc1394 ] + ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to + ++ optionals (withNvdec || withNvenc) [ nv-codec-headers ] + ++ optionals withAlsa [ alsa-lib ] + ++ optionals withAom [ libaom ] + ++ optionals withAss [ libass ] + ++ optionals withBluray [ libbluray ] + ++ optionals withBs2b [ libbs2b ] + ++ optionals withBzlib [ bzip2 ] + ++ optionals withCaca [ libcaca ] + ++ optionals withCelt [ celt ] + ++ optionals withCudaLLVM [ clang ] + ++ optionals withDav1d [ dav1d ] + ++ optionals withDrm [ libdrm ] + ++ optionals withFdkAac [ fdk_aac ] + ++ optionals withFontconfig [ fontconfig ] + ++ optionals withFreetype [ freetype ] + ++ optionals withFrei0r [ frei0r ] + ++ optionals withFribidi [ fribidi ] + ++ optionals withGlslang [ glslang ] + ++ optionals withGme [ game-music-emu ] + ++ optionals withGnutls [ gnutls ] + ++ optionals withGsm [ gsm ] + ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? + ++ optionals withJack [ libjack2 ] + ++ optionals withLadspa [ ladspaH ] + ++ optionals withLzma [ xz ] + ++ optionals withMfx [ intel-media-sdk ] + ++ optionals withModplug [ libmodplug ] + ++ optionals withMp3lame [ lame ] + ++ optionals withMysofa [ libmysofa ] + ++ optionals withOgg [ libogg ] + ++ optionals withOpenal [ openal ] + ++ optionals withOpencl [ ocl-icd opencl-headers ] + ++ optionals withOpencoreAmrnb [ opencore-amr ] + ++ optionals withOpengl [ libGL libGLU ] + ++ optionals withOpenh264 [ openh264 ] + ++ optionals withOpenjpeg [ openjpeg ] + ++ optionals withOpenmpt [ libopenmpt ] + ++ optionals withOpus [ libopus ] + ++ optionals withPulse [ libpulseaudio ] + ++ optionals withRav1e [ rav1e ] + ++ optionals withRtmp [ rtmpdump ] + ++ optionals withSamba [ samba ] + ++ optionals withSdl2 [ SDL2 ] + ++ optionals withSoxr [ soxr ] + ++ optionals withSpeex [ speex ] + ++ optionals withSrt [ srt ] + ++ optionals withSsh [ libssh ] + ++ optionals withSvg [ librsvg ] + ++ optionals withSvtav1 [ svt-av1 ] + ++ optionals withTheora [ libtheora ] + ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] + ++ optionals withVdpau [ libvdpau ] + ++ optionals withVidStab [ vid-stab ] + ++ optionals withVmaf [ libvmaf ] + ++ optionals withVoAmrwbenc [ vo-amrwbenc ] + ++ optionals withVorbis [ libvorbis ] + ++ optionals withVpx [ libvpx ] + ++ optionals withV4l2 [ libv4l ] + ++ optionals withVulkan [ vulkan-loader ] + ++ optionals withWebp [ libwebp ] + ++ optionals withX264 [ x264 ] + ++ optionals withX265 [ x265 ] + ++ optionals withXavs [ xavs ] + ++ optionals withXcb [ libxcb ] + ++ optionals withXlib [ libX11 libXv libXext ] + ++ optionals withXml2 [ libxml2 ] + ++ optionals withXvid [ xvidcore ] + ++ optionals withZimg [ zimg ] + ++ optionals withZlib [ zlib ] + ++ optionals withZmq [ zeromq4 ] + ++ optionals stdenv.isDarwin [ + # TODO fine-grained flags + AVFoundation + Cocoa + CoreAudio + CoreMedia + CoreServices + MediaToolbox + VideoDecodeAcceleration + VideoToolbox + ]; + + buildFlags = [ "all" ] + ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + # Fails with SIGABRT otherwise FIXME: Why? + checkPhase = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libsToLink = [ ] + ++ optional buildAvcodec "libavcodec" + ++ optional buildAvdevice "libavdevice" + ++ optional buildAvfilter "libavfilter" + ++ optional buildAvformat "libavformat" + ++ optional buildAvresample "libavresample" + ++ optional buildAvutil "libavutil" + ++ optional buildPostproc "libpostproc" + ++ optional buildSwresample "libswresample" + ++ optional buildSwscale "libswscale" + ; + in '' + ${ldLibraryPathEnv}="${lib.concatStringsSep ":" libsToLink}" make check -j$NIX_BUILD_CORES + ''; + + outputs = optionals withBin [ "bin" ] # The first output is the one that gets symlinked by default! + ++ optionals withLib [ "lib" "dev" ] + ++ optionals withDoc [ "doc" ] + ++ optionals withManPages [ "man" ] + ++ [ "data" "out" ] # We need an "out" output because we get an error otherwise. It's just an empty dir. + ; + + postInstall = optionalString buildQtFaststart '' + install -D tools/qt-faststart -t $bin/bin + ''; + + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/libavcodec.so addOpenGLRunpath $out/lib/libavutil.so ''; - installFlags = [ "install-man" ]; + enableParallelBuilding = true; - passthru = { - inherit vaapiSupport vdpauSupport; - }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; @@ -212,9 +673,12 @@ stdenv.mkDerivation rec { No matter if they were designed by some standards committee, the community or a corporation. ''; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; + license = with licenses; [ lgpl21Plus ] + ++ optional withGPL gpl2Plus + ++ optional withGPLv3 gpl3Plus + ++ optional withUnfree unfreeRedistributable; + pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; - inherit branch knownVulnerabilities; + maintainers = with maintainers; [ atemu ]; }; -} +}) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index c5edb5926209..9d83fdb4878e 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/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/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix new file mode 100644 index 000000000000..f00980cdd9be --- /dev/null +++ b/pkgs/development/libraries/fizz/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, cmake +, boost +, libevent +, double-conversion +, glog +, lib +, fmt_8 +, zstd +, gflags +, libiberty +, openssl +, folly +, libsodium +, gtest +, zlib +}: + +stdenv.mkDerivation rec { + pname = "fizz"; + version = "2023.02.06.00"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "fizz"; + rev = "v${version}"; + sha256 = "sha256-JwRoIiSumT1jw5/VX/TkxpTJbrmLLke27xH8UHtrs2c="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../fizz"; + + cmakeFlags = [ "-Wno-dev" ] + ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + NIX_LDFLAGS = "-lz"; + + buildInputs = [ + fmt_8 + boost + double-conversion + folly + glog + gflags + gtest + libevent + libiberty + libsodium + openssl + zlib + zstd + ]; + + meta = with lib; { + description = "C++14 implementation of the TLS-1.3 standard"; + homepage = "https://github.com/facebookincubator/fizz"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 14e6abd90065..7fd08bc599a6 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.1"; + version = "1.14.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 6b8017684d45..ffefdd6ed621 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 146c4f87..bcdad2bc 100644 +index d35b4652..b4bb4a44 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { - {"GST_PTP_HELPER", NULL}, - {"GST_PTP_HELPER_1_0", NULL}, - {"GST_INSTALL_PLUGINS_HELPER", NULL}, +@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = { + {"KRB5CCNAME", NULL}, + {"XKB_CONFIG_ROOT", NULL}, + {"GIO_EXTRA_MODULES", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 323a9a2f8b46..9f54350e4e22 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , boost , cmake @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.11.28.00"; + version = "2023.02.06.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-TI3uMlkssKtTvxqj9Et12aAjbHoV9FVBvrZr7oCFlIo="; + sha256 = "sha256-37BoLs7LynuMuF7cdJtVOfZSs22PZr6DYNAVwigZghw="; }; nativeBuildInputs = [ @@ -57,7 +58,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + + # temporary hack until folly builds work on aarch64, + # see https://github.com/facebook/folly/issues/1880 + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + ]; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \ diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 36bc4a256777..c29899922979 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, darwin, fetchurl, openal }: +{ lib, stdenv, darwin, fetchurl, openal +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freealut"; version = "1.1.0"; src = fetchurl { - url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz"; + url = "http://www.openal.org/openal_webstf/downloads/freealut-${finalAttrs.version}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; @@ -14,10 +16,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.OpenAL ; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = lib.licenses.lgpl2; + pkgConfigModules = [ "freealut" ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 776023f35f01..8c12766204cf 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }: +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freeglut"; version = "3.2.2"; src = fetchurl { - url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; + url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz"; sha256 = "sha256-xZRKCC3wu6lrV1bd2x910M1yzie1OVxsHd6Fwv8pelA="; }; @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' @@ -34,7 +38,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://freeglut.sourceforge.net/"; license = licenses.mit; + pkgConfigModules = [ "glut" ]; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 68907d798e19..48048e4a9108 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -22,14 +22,15 @@ , qt5 , texmacs , ttfautohint +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freetype"; version = "2.12.1"; - src = fetchurl { + src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { ttfautohint; inherit (python3.pkgs) freetype-py; inherit (qt5) qtbase; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -96,6 +98,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freetype.org/"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; + pkgConfigModules = [ "freetype2" ]; maintainers = with maintainers; [ ttuegel ]; }; -} +}) diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4000129f557a..8b54cfb7b879 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preCheck = '' ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} - ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} + ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} ''; cmakeFlags = lib.optionals enablePython [ diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 5e44d2221f2a..ca0e8f81c4d0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -19,16 +19,19 @@ , doCheck ? false , makeWrapper , lib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; version = "2.42.10"; outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "7ptsddE7oJaQei48aye2G80X9cfr6rWltDnS8uOf5Es="; }; @@ -97,7 +100,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - for f in $out/${passthru.moduleDir}/*.dylib; do + for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done @@ -127,12 +130,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; versionPolicy = "odd-unstable"; }; tests = { installedTests = nixosTests.installed-tests.gdk-pixbuf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc @@ -145,6 +149,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; mainProgram = "gdk-pixbuf-thumbnailer"; + pkgConfigModules = [ "gdk-pixbuf-2.0" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 61106d7f620e..5400c1de5927 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -47,6 +47,15 @@ stdenv.mkDerivation rec { sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0="; }; + patches = [ + (fetchurl { + name = "libraw.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/gegl04.git/plain/" + + "libraw.patch?id=5efd0c16a7b0e73abcaecc48af544ef027f4531b"; + hash = "sha256-ZgVigN1T7JmeBMwSdBsMsmXx0h7UW4Ft9HlSqeB0se8="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index fd0531fa747f..415746d3e544 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -1,11 +1,15 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.9.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; }; @@ -14,12 +18,15 @@ stdenv.mkDerivation rec { # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index a331e0254568..670fa30cb0f1 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -2,14 +2,16 @@ , stdenv , fetchurl , fetchpatch -, cmake }: +, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.11.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; }; @@ -17,12 +19,15 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ae5b9f48293a..81f7abc90a38 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; + LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ "--disable-csharp" "--with-xz" diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index b79c83cbf155..617d51d85ed5 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gl3w"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 8fa77013e105..3f355deb33b9 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext , AGL, OpenGL +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/glew/glew-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; @@ -41,11 +42,14 @@ stdenv.mkDerivation rec { "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] + pkgConfigModules = [ "glew" ]; platforms = platforms.mesaPlatforms; }; -} +}) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 1e30eb744ba8..4cbd85e7a04c 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext , OpenGL , enableEGL ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${pname}-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; @@ -44,14 +45,17 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing + pkgConfigModules = [ "glew" ]; platforms = with platforms; if enableEGL then subtractLists darwin mesaPlatforms else mesaPlatforms; }; -} +}) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac7977d0f62f..9e932e547f43 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -19,6 +19,7 @@ , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch +, testers }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -280,7 +281,10 @@ stdenv.mkDerivation (finalAttrs: { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; - tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + tests = { + withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; inherit flattenInclude; updateScript = gnome.updateScript { @@ -306,6 +310,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wiki.gnome.org/Projects/GLib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + pkgConfigModules = [ + "gio-2.0" + "gobject-2.0" + "gthread-2.0" + ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 780a3e091daf..a3c2e4618493 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation ({ buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; env = { - linuxHeaders = if withLinuxHeaders then linuxHeaders else ""; + linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders; inherit (stdenv) is64bit; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 8fc57d865fd7..69243a13ef30 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec{ sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f"; }; + # needed since gcc12 + postPatch = '' + sed '1i#include ' -i \ + src/tests/{tag/tag_perf.cpp,zlib/zlib_perf.cpp} \ + src/examples/*.cpp + ''; + buildInputs = [ ] ++ lib.optional zlibSupport zlib ++ lib.optional sslSupport openssl diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index f1ec87ba008d..4ab7360f1f07 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -7,6 +7,19 @@ , withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit , withSecurity ? true, Security # darwin Security.framework # certificate compression - only zlib now, more possible: zstd, brotli + +# for passthru.tests +, curlWithGnuTls +, emacs +, ffmpeg +, haskellPackages +, knot-resolver +, ngtcp2-gnutls +, ocamlPackages +, python3Packages +, qemu +, rsyslog +, samba }: assert guileBindings -> guile != null; @@ -105,6 +118,14 @@ stdenv.mkDerivation rec { --replace "-lunistring" "" ''; + passthru.tests = { + inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver; + inherit (ocamlPackages) ocamlnet; + haskell-gnutls = haskellPackages.gnutls; + python3-gnutls = python3Packages.python3-gnutls; + rsyslog = rsyslog.override { withGnutls = true; }; + }; + meta = with lib; { description = "The GNU Transport Layer Security Library"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4ab8cbbf9650..f83b7c10819e 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -21,6 +21,7 @@ , gobject-introspection-unwrapped , nixStoreDir ? builtins.storeDir , x11Support ? true +, testers }: # now that gobject-introspection creates large .gir files (eg gtk3 case) @@ -145,12 +146,14 @@ stdenv.mkDerivation (finalAttrs: { packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); + pkgConfigModules = [ "gobject-introspection-1.0" ]; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 0d14630bda3b..590a4508c9b9 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "gsl"; version = "2.7.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnu/gsl/${pname}-${version}.tar.gz"; sha256 = "sha256-3LD71DBIgyt1f/mUJpGo3XACbV2g/4VgHlJof23us0s="; @@ -13,6 +15,10 @@ stdenv.mkDerivation rec { MACOSX_DEPLOYMENT_TARGET=10.16 '' else null; + postInstall = '' + moveToOutput bin/gsl-config "$dev" + ''; + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index ec6646d98f57..f993eeedc33b 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -2,13 +2,21 @@ stdenv.mkDerivation rec { pname = "gsmlib"; version = "unstable-2017-10-06"; + src = fetchFromGitHub { owner = "x-logLT"; repo = "gsmlib"; rev = "4f794b14450132f81673f7d3570c5a859aecf7ae"; sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5"; }; + nativeBuildInputs = [ autoreconfHook ]; + + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-std=c++14" + ]; + meta = with lib; { description = "Library to access GSM mobile phones through GSM modems"; homepage = "https://github.com/x-logLT/gsmlib"; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index dd7852ac555b..3eacad32f813 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/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/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 395708c2a680..e03f9f0b844f 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,15 +37,18 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; version = "1.20.3"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8="; }; @@ -146,11 +149,19 @@ stdenv.mkDerivation rec { waylandEnabled = enableWayland; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Base GStreamer plug-ins and helper libraries"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-audio-1.0" + "gstreamer-base-1.0" + "gstreamer-net-1.0" + "gstreamer-video-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 41acd079583e..80fc921a3679 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,9 +17,10 @@ , lib , CoreServices , gobject-introspection +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; version = "1.20.3"; @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio="; }; @@ -108,11 +111,16 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with lib ;{ + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { description = "Open source multimedia framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-controller-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 049d202a71ec..1dd68b077b20 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, cmake, ninja, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, static ? stdenv.hostPlatform.isStatic, +}: stdenv.mkDerivation rec { pname = "gtest"; @@ -19,7 +25,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) [ + # Enable C++17 support + # https://github.com/google/googletest/issues/3081 + "-DCMAKE_CXX_STANDARD=17" + ]; meta = with lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 92a126bd7e8f..92fc02bfa2c9 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, wayland-scanner , wayland , gtk3 , gobject-introspection @@ -26,6 +29,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; + patches = [ + # https://github.com/wmww/gtk-layer-shell/pull/146 + # Mark wayland-scanner as a build-time dependency + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; + hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; + }) + # https://github.com/wmww/gtk-layer-shell/pull/147 + # Remove redundant dependency check for gtk-doc + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; + hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -35,6 +59,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 vala + wayland-scanner ]; buildInputs = [ @@ -51,6 +76,6 @@ stdenv.mkDerivation rec { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 23680c9b6757..88dfc54094f3 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -5,6 +5,7 @@ , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch, buildPackages +, testers }: let @@ -17,12 +18,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+"; version = "2.24.33"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; @@ -37,7 +38,9 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; + nativeBuildInputs = finalAttrs.setupHooks ++ [ + perl pkg-config gettext gobject-introspection + ]; patches = [ ./patches/2.0-immodules.cache.patch @@ -90,6 +93,7 @@ stdenv.mkDerivation rec { $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache ''; # workaround for bug of nix-mode for Emacs */ ''; inherit gdktarget; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -97,6 +101,13 @@ stdenv.mkDerivation rec { homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; + pkgConfigModules = [ + "gdk-2.0" + "gtk+-2.0" + ] ++ lib.optionals (gdktarget == "x11") [ + "gdk-x11-2.0" + "gtk+-x11-2.0" + ]; platforms = platforms.all; longDescription = '' @@ -111,4 +122,4 @@ stdenv.mkDerivation rec { ''; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 1533f59b4aec..6737cdd7e410 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -46,6 +46,7 @@ , QuartzCore , broadwaySupport ? true , wayland-scanner +, testers }: let @@ -58,7 +59,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; version = "3.24.36"; @@ -70,7 +71,9 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; @@ -99,7 +102,7 @@ stdenv.mkDerivation rec { python3 sassc gdk-pixbuf - ] ++ setupHooks ++ lib.optionals withGtkDoc [ + ] ++ finalAttrs.setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 docbook-xsl-nons gtk-doc @@ -212,7 +215,7 @@ stdenv.mkDerivation rec { for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done '' + lib.optionalString stdenv.isDarwin '' # a comment created a cycle between outputs @@ -225,6 +228,7 @@ stdenv.mkDerivation rec { attrPath = "gtk3"; freeze = true; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -242,7 +246,14 @@ stdenv.mkDerivation rec { homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; + pkgConfigModules = [ + "gdk-3.0" + "gtk+-3.0" + ] ++ lib.optionals x11Support [ + "gdk-x11-3.0" + "gtk+-x11-3.0" + ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 447e7d061fdb..704a7c3e9c54 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "3.24.11"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -42,10 +46,13 @@ stdenv.mkDerivation rec { make check ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 95e6e8d2e107..e824e1ed9c67 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -19,15 +19,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "4.8.4"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0="; }; @@ -101,11 +104,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 849c3caf2672..100e3e44a88f 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -20,15 +20,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; @@ -117,11 +120,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 782823cd6748..7a9904f31dab 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation rec { # Slightly hacky; some pkgs expect them in a single directory. postFixup = lib.optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" - ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc ${lib.optionalString stdenv.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index b29b64c2a757..e9bfe33e9f48 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -7,16 +7,17 @@ , udev , Cocoa , IOKit +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hidapi"; version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; - rev = "${pname}-${version}"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; @@ -28,12 +29,20 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; + pkgConfigModules = lib.optionals stdenv.isDarwin [ + "hidapi" + ] ++ lib.optionals stdenv.isLinux [ + "hidapi-hidraw" + "hidapi-libusb" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 5e6cef2aff67..3d0ef7740e7f 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "httplib"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg="; + hash = "sha256-Qr8jaZSj5xPiTF8reur09/R2jrtDk5hxHKeVTccHbZQ="; }; # Header-only library. diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 66441a911607..324b4337c874 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; pname = "hunspell"; src = fetchFromGitHub { owner = "hunspell"; repo = "hunspell"; rev = "v${version}"; - sha256 = "sha256-J1kgNUElRO63mtU62qU7asf7hht9oyplMIO9I/E6BPU="; + sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8="; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 3eee425d4be8..09d68fa0199d 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -878,4 +878,28 @@ rec { shortDescription = "Norwegian Nynorsk (Norway)"; license = with lib.licenses; [ gpl2Only ]; }; + + /* TOKI PONA */ + + tok = mkDict rec { + pname = "hunspell-dict-tok"; + version = "20220829"; + dictFileName = "tok"; + readmeFile = "README.en.adoc"; + + src = fetchzip { + url = "https://github.com/somasis/hunspell-tok/releases/download/${version}/hunspell-tok-${version}.tar.gz"; + sha256 = "sha256-RiAODKXPUeIcf8IFcU6Tacehq5S8GYuPTuxEiN2CXD0="; + }; + + dontBuild = true; + + meta = with lib; { + description = "Hunspell dictionary for Toki Pona"; + homepage = "https://github.com/somasis/hunspell-tok"; + license = with lib.licenses; [ cc0 publicDomain cc-by-sa-30 cc-by-sa-40 ]; + maintainers = with maintainers; [ somasis ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 19838763f5b4..a83e2cd5f5eb 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers +, buildRootOnly ? false +}: import ./base.nix { version = "63.1"; @@ -11,4 +13,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index a714e758bd88..c5e46fa4530d 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -2,6 +2,7 @@ { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot +, testers }: let @@ -45,6 +46,11 @@ let description = "Unicode and globalization support library"; homepage = "https://icu.unicode.org/"; maintainers = with maintainers; [ raskin ]; + pkgConfigModules = [ + "icu-i18n" + "icu-io" + "icu-uc" + ]; platforms = platforms.all; }; }; @@ -97,4 +103,6 @@ let then buildRootOnlyAttrs else realAttrs; in -stdenv.mkDerivation attrs +stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; +}) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 66092f436509..02707c750c06 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -21,17 +21,18 @@ , fluxbox , enlightenment , xorg +, testers }: let inherit (lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; version = "1.9.1"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; + url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM="; }; @@ -69,6 +70,8 @@ stdenv.mkDerivation rec { enlightenment; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Image manipulation library"; @@ -83,7 +86,8 @@ stdenv.mkDerivation rec { homepage = "https://docs.enlightenment.org/api/imlib2/html"; changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; license = licenses.imlib2; + pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; -} +}) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 5e6f628aa68e..11cd887729a7 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/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/pkgs/development/libraries/iqueue/default.nix b/pkgs/development/libraries/iqueue/default.nix index 04fd7202d1d1..ab873f82c579 100644 --- a/pkgs/development/libraries/iqueue/default.nix +++ b/pkgs/development/libraries/iqueue/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd microsoft_gsl ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-parameter" + "-Wno-error=misleading-indentation" + ]; + meta = with lib; { homepage = "https://github.com/twosigma/iqueue"; description = "Indexed queue"; diff --git a/pkgs/development/libraries/irr1/default.nix b/pkgs/development/libraries/irr1/default.nix new file mode 100644 index 000000000000..8740919ce3ae --- /dev/null +++ b/pkgs/development/libraries/irr1/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "irr1"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "berndporr"; + repo = "iir1"; + rev = version; + hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A DSP IIR realtime filter library written in C++"; + downloadPage = "https://github.com/berndporr/iir1"; + homepage = "http://berndporr.github.io/iir1/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix new file mode 100644 index 000000000000..26b21aa7c957 --- /dev/null +++ b/pkgs/development/libraries/jbig2enc/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, leptonica +, zlib +, libwebp +, giflib +, libjpeg +, libpng +, libtiff +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "agl"; + repo = "jbig2enc"; + rev = version; + hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; + }; + + buildInputs = [ autoreconfHook ]; + propagatedBuildInputs = [ + leptonica + zlib + libwebp + giflib + libjpeg + libpng + libtiff + ]; + + patches = [ + (fetchpatch { + name = "fix-build-leptonica-1.83.patch"; + url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch"; + hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8="; + }) + ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; + + meta = { + description = "Encoder for the JBIG2 image compression format"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + homepage = "https://github.com/agl/jbig2enc"; + }; +} diff --git a/pkgs/development/libraries/jpcre2/default.nix b/pkgs/development/libraries/jpcre2/default.nix new file mode 100644 index 000000000000..51fbba13ba0c --- /dev/null +++ b/pkgs/development/libraries/jpcre2/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "jpcre2"; + version = "10.32.01"; + rev = version; + + src = fetchFromGitHub { + owner = "jpcre2"; + repo = "jpcre2"; + rev = "refs/tags/${version}"; + hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8="; + }; + + buildInputs = [ pcre2 ]; + + meta = with lib; { + homepage = "https://docs.neuzunix.com/jpcre2/latest/"; + description = "C++ wrapper for PCRE2 Library"; + platforms = lib.platforms.all; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index ac7f75f5e742..dcd7a76acb33 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -19,7 +19,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = "http://www.kde.org"; + homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c3d88103c2e3..fc5855702175 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.102/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 98f7e178fb64..9254043117ae 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -11,4 +11,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; + + meta.homepage = "https://invent.kde.org/frameworks/kguiaddons"; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index cbdaf1da892d..beec3e13cf71 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/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/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3edab9894b95..6aa97206e39c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/attica-5.102.0.tar.xz"; - sha256 = "1xph3l4if2vv2gdv9wjk0ls38g77jdzg3j81fyng8pvxsl32z1yv"; - name = "attica-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz"; + sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s"; + name = "attica-5.103.0.tar.xz"; }; }; baloo = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/baloo-5.102.0.tar.xz"; - sha256 = "0y6xc7dihzrcmpb75p8206832kz108l6irdzjv4m0pm0qdj3kb6x"; - name = "baloo-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz"; + sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk"; + name = "baloo-5.103.0.tar.xz"; }; }; bluez-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/bluez-qt-5.102.0.tar.xz"; - sha256 = "0023nhlsniqkkzqjif22fk1hrlzpmigdnc8v4v5z0qf488b0pyf3"; - name = "bluez-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz"; + sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz"; + name = "bluez-qt-5.103.0.tar.xz"; }; }; breeze-icons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/breeze-icons-5.102.0.tar.xz"; - sha256 = "1673fjh2q5388764rkkjs5v7jsswr71xdw582irwwz4zic5dkcrd"; - name = "breeze-icons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz"; + sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br"; + name = "breeze-icons-5.103.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/extra-cmake-modules-5.102.0.tar.xz"; - sha256 = "16vz555f5dmj0prpdr9sbla44gkdmzrlb1k51qmfwip0m2sswngj"; - name = "extra-cmake-modules-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz"; + sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj"; + name = "extra-cmake-modules-5.103.0.tar.xz"; }; }; frameworkintegration = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/frameworkintegration-5.102.0.tar.xz"; - sha256 = "00qr6n4h8fgm3vy64plj5762wyfanglh8r8qljvpk9jll74wm01d"; - name = "frameworkintegration-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz"; + sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93"; + name = "frameworkintegration-5.103.0.tar.xz"; }; }; kactivities = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-5.102.0.tar.xz"; - sha256 = "1kl1la4a4zagy7h1sf4l0wdwzg53v28z70sv73dwd6869dmmwygr"; - name = "kactivities-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz"; + sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd"; + name = "kactivities-5.103.0.tar.xz"; }; }; kactivities-stats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-stats-5.102.0.tar.xz"; - sha256 = "06v2qrd6g20028skh9dq2csw0nggf05qh8w8nz0zvx8q2q2fszhh"; - name = "kactivities-stats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz"; + sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r"; + name = "kactivities-stats-5.103.0.tar.xz"; }; }; kapidox = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kapidox-5.102.0.tar.xz"; - sha256 = "0jalyq3nzms4j55kqxmqbjyvbrdw0k1142mjpds24xjb87wgj1rq"; - name = "kapidox-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz"; + sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5"; + name = "kapidox-5.103.0.tar.xz"; }; }; karchive = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/karchive-5.102.0.tar.xz"; - sha256 = "0jnqrxpyfqwamq8gim270y5zg6l7inlplc50xdvig5dr0f4d1v20"; - name = "karchive-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz"; + sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp"; + name = "karchive-5.103.0.tar.xz"; }; }; kauth = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kauth-5.102.0.tar.xz"; - sha256 = "093c1rzgw3rh8ka1q5hdxnn56mxzrrn7v3r3yinr6cy0xif0c4ld"; - name = "kauth-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz"; + sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd"; + name = "kauth-5.103.0.tar.xz"; }; }; kbookmarks = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kbookmarks-5.102.0.tar.xz"; - sha256 = "1jg99z75bdkckahzia17ilbcfvnnamqg9ra0gx2lk1hlhzffi7ls"; - name = "kbookmarks-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz"; + sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs"; + name = "kbookmarks-5.103.0.tar.xz"; }; }; kcalendarcore = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcalendarcore-5.102.0.tar.xz"; - sha256 = "0s2m1d15py39nqagh1abprq6r099mdcci8sm28hp2c2cjwsr7xbk"; - name = "kcalendarcore-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz"; + sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp"; + name = "kcalendarcore-5.103.0.tar.xz"; }; }; kcmutils = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcmutils-5.102.0.tar.xz"; - sha256 = "1fiszfpay1cnyqhfyhl4mpw9j8jmknfisxgwqvd61qfa622ryhxj"; - name = "kcmutils-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz"; + sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw"; + name = "kcmutils-5.103.0.tar.xz"; }; }; kcodecs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcodecs-5.102.0.tar.xz"; - sha256 = "15k3rlbjb2dji8n7bxb4d8nc7cs7618fhv8x5k50x6kbx867rx88"; - name = "kcodecs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz"; + sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y"; + name = "kcodecs-5.103.0.tar.xz"; }; }; kcompletion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcompletion-5.102.0.tar.xz"; - sha256 = "1jgr8an283l9d1zhl3cqpp66d90bscfv186jan01r8wan69awy2v"; - name = "kcompletion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz"; + sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh"; + name = "kcompletion-5.103.0.tar.xz"; }; }; kconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfig-5.102.0.tar.xz"; - sha256 = "0cxc2gfank22yzflxdjr766xn4lr2ij9b5v23g9y1mwfsc2ng3pn"; - name = "kconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz"; + sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz"; + name = "kconfig-5.103.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfigwidgets-5.102.0.tar.xz"; - sha256 = "19vs2ydlw76v44xyzhfgl70dw0qan2g5z3dq0hzljf5pkc8mhr6p"; - name = "kconfigwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz"; + sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r"; + name = "kconfigwidgets-5.103.0.tar.xz"; }; }; kcontacts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcontacts-5.102.0.tar.xz"; - sha256 = "04xi28mk5i0l1jgvw0dbapjnk2c6j1y1fxldhhapg722kiw9566y"; - name = "kcontacts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz"; + sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk"; + name = "kcontacts-5.103.0.tar.xz"; }; }; kcoreaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcoreaddons-5.102.0.tar.xz"; - sha256 = "0j09lb6lbyv5hvvw57i0s5pmd24cywzv9ncrd1chnbk0jcczkqw2"; - name = "kcoreaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz"; + sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy"; + name = "kcoreaddons-5.103.0.tar.xz"; }; }; kcrash = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcrash-5.102.0.tar.xz"; - sha256 = "1i6jm2jgvqrm95dqdml0w0z9jc9j9n7h48y8zck7s3vaww1v7a67"; - name = "kcrash-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz"; + sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m"; + name = "kcrash-5.103.0.tar.xz"; }; }; kdav = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdav-5.102.0.tar.xz"; - sha256 = "0prr27mv7mhcynvkp9kzk7a1xiawilvafvzv3a6xdkr5w91741bf"; - name = "kdav-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz"; + sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il"; + name = "kdav-5.103.0.tar.xz"; }; }; kdbusaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdbusaddons-5.102.0.tar.xz"; - sha256 = "1lqskn739bix5fp1s40gb7fch66pa9bmlwxzfg9lyqa5xmpfxfzi"; - name = "kdbusaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz"; + sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6"; + name = "kdbusaddons-5.103.0.tar.xz"; }; }; kdeclarative = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdeclarative-5.102.0.tar.xz"; - sha256 = "0xvwr1mjviwixbs2i8yh3b37ds4jcgvfrv2z366dld40shs65m0a"; - name = "kdeclarative-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz"; + sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn"; + name = "kdeclarative-5.103.0.tar.xz"; }; }; kded = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kded-5.102.0.tar.xz"; - sha256 = "0fjnb9wgpir91jwvl9dbnbvcf3c94l63vjs6ylvcd2w8lxasyxb7"; - name = "kded-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz"; + sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0"; + name = "kded-5.103.0.tar.xz"; }; }; kdelibs4support = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdelibs4support-5.102.0.tar.xz"; - sha256 = "0s823mcwg7l72aq55q8vh48pyp3apk3hm87jh9lc1ijg9frgcgk4"; - name = "kdelibs4support-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz"; + sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv"; + name = "kdelibs4support-5.103.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdesignerplugin-5.102.0.tar.xz"; - sha256 = "1nn2f0jln4qni2gaq0anchrv42fcf83m22ag9r3c4sy7vxr8irbc"; - name = "kdesignerplugin-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz"; + sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw"; + name = "kdesignerplugin-5.103.0.tar.xz"; }; }; kdesu = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdesu-5.102.0.tar.xz"; - sha256 = "0ps88rvvzagpw4qp4nj86wknyhm9mmdlkhs0i7cywf53pdr37afh"; - name = "kdesu-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz"; + sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi"; + name = "kdesu-5.103.0.tar.xz"; }; }; kdewebkit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdewebkit-5.102.0.tar.xz"; - sha256 = "137j897admfp5d8g1x1g5x9h4nmsp6padi17nx4y350kriyhxkkv"; - name = "kdewebkit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz"; + sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz"; + name = "kdewebkit-5.103.0.tar.xz"; }; }; kdnssd = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdnssd-5.102.0.tar.xz"; - sha256 = "10awmh1j05hlg957ih7a1shapl6fgp1ma5b7qvbsp4fi5nh2k985"; - name = "kdnssd-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz"; + sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6"; + name = "kdnssd-5.103.0.tar.xz"; }; }; kdoctools = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdoctools-5.102.0.tar.xz"; - sha256 = "11g671mlva00fk7yfym5a73sfjdy0zkhh3a7h4zv0s763nnmkg13"; - name = "kdoctools-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz"; + sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs"; + name = "kdoctools-5.103.0.tar.xz"; }; }; kemoticons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kemoticons-5.102.0.tar.xz"; - sha256 = "0arligy3i9qcqx9kapv692nz8dl1kimfv03392z3w3qqdwlpc9v5"; - name = "kemoticons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz"; + sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k"; + name = "kemoticons-5.103.0.tar.xz"; }; }; kfilemetadata = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kfilemetadata-5.102.0.tar.xz"; - sha256 = "0kv33rqp3wshhmv2pdayggxlxal6ihjam2als3d9a5hm1h5kz2fc"; - name = "kfilemetadata-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz"; + sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329"; + name = "kfilemetadata-5.103.0.tar.xz"; }; }; kglobalaccel = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kglobalaccel-5.102.0.tar.xz"; - sha256 = "1l2mk7192wdb1qv62fqk9w1w6zbsmfr822gr5azg6nnzv4gdvadm"; - name = "kglobalaccel-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz"; + sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls"; + name = "kglobalaccel-5.103.0.tar.xz"; }; }; kguiaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kguiaddons-5.102.0.tar.xz"; - sha256 = "1awgfnxmvghh70ldnpb1759wmy1i6rwsp3nggdj2ncdbdbgj04sv"; - name = "kguiaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz"; + sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6"; + name = "kguiaddons-5.103.0.tar.xz"; }; }; kholidays = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kholidays-5.102.0.tar.xz"; - sha256 = "01rznsqxg7crljzy0lcal6r03qvfg8qrh0zigh26073rdn56g5d1"; - name = "kholidays-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz"; + sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda"; + name = "kholidays-5.103.0.tar.xz"; }; }; khtml = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/khtml-5.102.0.tar.xz"; - sha256 = "0az046m9n954cb70iqgx2isspbc0zb89fw97nhmw9szgfsliy8ab"; - name = "khtml-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz"; + sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s"; + name = "khtml-5.103.0.tar.xz"; }; }; ki18n = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ki18n-5.102.0.tar.xz"; - sha256 = "0iwz3jwaqlbja338gkq7sz7f8sw2rp37grkqpvx62274qflq1qww"; - name = "ki18n-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz"; + sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq"; + name = "ki18n-5.103.0.tar.xz"; }; }; kiconthemes = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kiconthemes-5.102.0.tar.xz"; - sha256 = "1q1fij7vn5b34k99cz4x58b5b8a04vrlkdckc8bxbbccpvy5xkyh"; - name = "kiconthemes-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz"; + sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828"; + name = "kiconthemes-5.103.0.tar.xz"; }; }; kidletime = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kidletime-5.102.0.tar.xz"; - sha256 = "159grvvw7zdp2hkiq20iz9zy8ilq6mfr3dmyq51pfq9741nd88qf"; - name = "kidletime-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz"; + sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh"; + name = "kidletime-5.103.0.tar.xz"; }; }; kimageformats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kimageformats-5.102.0.tar.xz"; - sha256 = "1d29dnjca0fgwi5ri6x4gqgsp8h4x5yidf7ifnpf7qyhwm22r2x6"; - name = "kimageformats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz"; + sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx"; + name = "kimageformats-5.103.0.tar.xz"; }; }; kinit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kinit-5.102.0.tar.xz"; - sha256 = "03pzsnis8lpsglry5iwkwfvn6fnn82rdxn6pac1cs0jhxwhg9fdc"; - name = "kinit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz"; + sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75"; + name = "kinit-5.103.0.tar.xz"; }; }; kio = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kio-5.102.0.tar.xz"; - sha256 = "0sviiq3axsxlf2nvxm0ccazbp7fw4dvky3dd87p82rng3v01g53a"; - name = "kio-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz"; + sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b"; + name = "kio-5.103.0.tar.xz"; }; }; kirigami2 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kirigami2-5.102.0.tar.xz"; - sha256 = "1ckmk0p0x5ymma3q5nkja3h6qz439qdxq0vchljg5yazxpiki08p"; - name = "kirigami2-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz"; + sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6"; + name = "kirigami2-5.103.0.tar.xz"; }; }; kitemmodels = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemmodels-5.102.0.tar.xz"; - sha256 = "19iqg7lbln0h1fkssa2jj58c9j04lvwwbbzrq11ds1wzjvw77xsj"; - name = "kitemmodels-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz"; + sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m"; + name = "kitemmodels-5.103.0.tar.xz"; }; }; kitemviews = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemviews-5.102.0.tar.xz"; - sha256 = "1c31qm059y7j0hskrbhm57qh6g2mm04qfjqbhili9qflp03fl69y"; - name = "kitemviews-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz"; + sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0"; + name = "kitemviews-5.103.0.tar.xz"; }; }; kjobwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kjobwidgets-5.102.0.tar.xz"; - sha256 = "1r6xfi4hwfj9hn1hmgniyx17z3b1himh0fmc6bd45b89jzdvmqcl"; - name = "kjobwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz"; + sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs"; + name = "kjobwidgets-5.103.0.tar.xz"; }; }; kjs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjs-5.102.0.tar.xz"; - sha256 = "14w523kv5jfp4hzfbkawsf5pljahihj8jxkyjk5r707nrbnqzd3w"; - name = "kjs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz"; + sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs"; + name = "kjs-5.103.0.tar.xz"; }; }; kjsembed = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjsembed-5.102.0.tar.xz"; - sha256 = "179gr69n0v39lbxi95w1ckk20505h4zqhxsqmy6fjs9vxc3zja5s"; - name = "kjsembed-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz"; + sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99"; + name = "kjsembed-5.103.0.tar.xz"; }; }; kmediaplayer = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kmediaplayer-5.102.0.tar.xz"; - sha256 = "0kmy4x9bi29nnd8sixrcdk4bhffh880a2p6pdcfz6sqp1i7n8v6s"; - name = "kmediaplayer-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz"; + sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw"; + name = "kmediaplayer-5.103.0.tar.xz"; }; }; knewstuff = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knewstuff-5.102.0.tar.xz"; - sha256 = "127w4vfpinq7lm6ckszfisyw7mjzs9v6s2ga4xyd6y7lzyf33gz5"; - name = "knewstuff-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz"; + sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6"; + name = "knewstuff-5.103.0.tar.xz"; }; }; knotifications = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifications-5.102.0.tar.xz"; - sha256 = "1y5sjzx9nyamalwl08y5krxajj0rvhhqgfdyavwkqbr30jpnmklk"; - name = "knotifications-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz"; + sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g"; + name = "knotifications-5.103.0.tar.xz"; }; }; knotifyconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifyconfig-5.102.0.tar.xz"; - sha256 = "05s8nzc7a01w3rxjb9jg7d98v4rd2dnncpmmv7ap209z10i09qh8"; - name = "knotifyconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz"; + sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs"; + name = "knotifyconfig-5.103.0.tar.xz"; }; }; kpackage = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpackage-5.102.0.tar.xz"; - sha256 = "0mas3dq39lcij3nva0vmqrggm5b43grmmmszfjqd7hrmgpm93n43"; - name = "kpackage-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz"; + sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb"; + name = "kpackage-5.103.0.tar.xz"; }; }; kparts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kparts-5.102.0.tar.xz"; - sha256 = "07vgc4fpwzkiylvlhniph7apggl563ma1hbnig9w1gkbwssyxjip"; - name = "kparts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz"; + sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az"; + name = "kparts-5.103.0.tar.xz"; }; }; kpeople = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpeople-5.102.0.tar.xz"; - sha256 = "1wi08waz3jv1bz6yf8hbnkyx3k80hdgnwvq0s3hsr3hsaal46dv2"; - name = "kpeople-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz"; + sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m"; + name = "kpeople-5.103.0.tar.xz"; }; }; kplotting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kplotting-5.102.0.tar.xz"; - sha256 = "1qq8m4wc9zz4s6l7myarryn2z7kj89rk51knjnq7kkibhbhwwsqy"; - name = "kplotting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz"; + sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv"; + name = "kplotting-5.103.0.tar.xz"; }; }; kpty = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpty-5.102.0.tar.xz"; - sha256 = "0f57fvljv7vmd89yyzbnj8lnafp495j3ial6dmh7wxfmbifw75gz"; - name = "kpty-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz"; + sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls"; + name = "kpty-5.103.0.tar.xz"; }; }; kquickcharts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kquickcharts-5.102.0.tar.xz"; - sha256 = "0w4h3jz5ki38y54papms2j1z57b0vna7ac89diffbld04aigjr40"; - name = "kquickcharts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz"; + sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8"; + name = "kquickcharts-5.103.0.tar.xz"; }; }; kross = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kross-5.102.0.tar.xz"; - sha256 = "0hdbz4ki5ccjpsi8m1x31v9k6c4kl63ak4pfnqllaxjlmpz6yyw3"; - name = "kross-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz"; + sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq"; + name = "kross-5.103.0.tar.xz"; }; }; krunner = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/krunner-5.102.0.tar.xz"; - sha256 = "0gvbmb8j7pqah1lvjcykr6i00q8zhybnc6b7x0ajndlqll72qzff"; - name = "krunner-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz"; + sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05"; + name = "krunner-5.103.0.tar.xz"; }; }; kservice = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kservice-5.102.0.tar.xz"; - sha256 = "1plsv4bbmq7xq3y1cnqzvm85wjxp4ivlwnd4snis55ch2qpqcqvh"; - name = "kservice-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz"; + sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q"; + name = "kservice-5.103.0.tar.xz"; }; }; ktexteditor = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktexteditor-5.102.0.tar.xz"; - sha256 = "1kvki86rnkabrjbgkf7jbrj8lrn83nb4gw9j4h5jmyiam8ybkj2w"; - name = "ktexteditor-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz"; + sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32"; + name = "ktexteditor-5.103.0.tar.xz"; }; }; ktextwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktextwidgets-5.102.0.tar.xz"; - sha256 = "1cipla0shfqpkx2gvvsxncsx4h9bc4zf078p1r9kf3v57pfdr0jc"; - name = "ktextwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz"; + sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m"; + name = "ktextwidgets-5.103.0.tar.xz"; }; }; kunitconversion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kunitconversion-5.102.0.tar.xz"; - sha256 = "11wdgzw5rsd0zbi24c6qvyavlx3hrnifq89ajyx1dpfsm1n21md3"; - name = "kunitconversion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz"; + sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd"; + name = "kunitconversion-5.103.0.tar.xz"; }; }; kwallet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwallet-5.102.0.tar.xz"; - sha256 = "10q9ckqybxdk14y7gy0fzaharz62axd965g17b0x18z9ln0g04d3"; - name = "kwallet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz"; + sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra"; + name = "kwallet-5.103.0.tar.xz"; }; }; kwayland = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwayland-5.102.0.tar.xz"; - sha256 = "1k5109pjl4fdsiqw4dzg8pl8nw4y59gbgf8cn6w2wp1b42kz89l6"; - name = "kwayland-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz"; + sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807"; + name = "kwayland-5.103.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwidgetsaddons-5.102.0.tar.xz"; - sha256 = "1lnnn8y2d72qpiq76mr9vk4037a6g59x1cjyvrpxymb3k0i9gmji"; - name = "kwidgetsaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz"; + sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c"; + name = "kwidgetsaddons-5.103.0.tar.xz"; }; }; kwindowsystem = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwindowsystem-5.102.0.tar.xz"; - sha256 = "1qb8mb9mgqwdbrd2g4r7x7f2qfmdm54i77r2157n7by9j6j9n36r"; - name = "kwindowsystem-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz"; + sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc"; + name = "kwindowsystem-5.103.0.tar.xz"; }; }; kxmlgui = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kxmlgui-5.102.0.tar.xz"; - sha256 = "06hk6j8hsc05cy6d8i3a6xjxxzwrvshjb3ij6ji1yvcbmfs2rrrp"; - name = "kxmlgui-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz"; + sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0"; + name = "kxmlgui-5.103.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kxmlrpcclient-5.102.0.tar.xz"; - sha256 = "06bjxi3k9q3n261rsc0qil5zzf4lxqfizd9b0jny8ygvvjs9han4"; - name = "kxmlrpcclient-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz"; + sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7"; + name = "kxmlrpcclient-5.103.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/modemmanager-qt-5.102.0.tar.xz"; - sha256 = "195p7xmc8fzywna6j9ppaajqav27prjkl8slwggnsyjbh5bb3a76"; - name = "modemmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz"; + sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88"; + name = "modemmanager-qt-5.103.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/networkmanager-qt-5.102.0.tar.xz"; - sha256 = "12q7fkhpidyyxa4byb88vsrkahgr4l2x3s9zylknb60cy86qpp69"; - name = "networkmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz"; + sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx"; + name = "networkmanager-qt-5.103.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/oxygen-icons5-5.102.0.tar.xz"; - sha256 = "05mwijl3day3vm8gs085cg3g04xi1x8ypwd87nc80jw7pz1m7mf4"; - name = "oxygen-icons5-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz"; + sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq"; + name = "oxygen-icons5-5.103.0.tar.xz"; }; }; plasma-framework = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz"; - sha256 = "14al5i40bpjw73wk0by9ca88s26hbns7msa4kil6zinzh8pvbkfk"; - name = "plasma-framework-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz"; + sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0"; + name = "plasma-framework-5.103.0.tar.xz"; }; }; prison = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/prison-5.102.0.tar.xz"; - sha256 = "1iw14s4hf2ap8qfrj7kf5xicsz78b4lwydg58ymv6z70jcl329nn"; - name = "prison-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz"; + sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4"; + name = "prison-5.103.0.tar.xz"; }; }; purpose = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/purpose-5.102.0.tar.xz"; - sha256 = "1a50nx7ldgx3gaqfh0k8lc6fx2ww7k07glg2qah5crwlwqxv70iw"; - name = "purpose-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz"; + sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k"; + name = "purpose-5.103.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/qqc2-desktop-style-5.102.0.tar.xz"; - sha256 = "1c6mgfq4lznm69a5z6cycc17hlp5j96635rasksxgsnib7mvzwfq"; - name = "qqc2-desktop-style-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz"; + sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi"; + name = "qqc2-desktop-style-5.103.0.tar.xz"; }; }; solid = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/solid-5.102.0.tar.xz"; - sha256 = "0cmik9c9s3nhqd5imkj4m9510whsf55nmw85xjsrnlh0fk6d7qq6"; - name = "solid-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz"; + sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0"; + name = "solid-5.103.0.tar.xz"; }; }; sonnet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/sonnet-5.102.0.tar.xz"; - sha256 = "04dci8l0v3v3s8fgn39sk67dbz44ah8qj5yvl5zn1xpwcfvj3ahf"; - name = "sonnet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz"; + sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k"; + name = "sonnet-5.103.0.tar.xz"; }; }; syndication = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syndication-5.102.0.tar.xz"; - sha256 = "1w08fn43hr4mnff62kzay4rblxbg4p6fghcp5bnziaddl0jpr799"; - name = "syndication-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz"; + sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng"; + name = "syndication-5.103.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syntax-highlighting-5.102.0.tar.xz"; - sha256 = "03zjf58y9n6fq3zhybp86fqh65vxk2i4pqrrv4lwm6wz9pj289rg"; - name = "syntax-highlighting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz"; + sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9"; + name = "syntax-highlighting-5.103.0.tar.xz"; }; }; threadweaver = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/threadweaver-5.102.0.tar.xz"; - sha256 = "1jxn1mf7xz3j9lz69kgcrqam87fxzyxp250vzl9hrs26jvw7lagr"; - name = "threadweaver-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz"; + sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19"; + name = "threadweaver-5.103.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 22b29151caa5..4caea890e705 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { sourceRoot = "krb5-${version}/src"; + postPatch = '' + substituteInPlace config/shlib.conf \ + --replace "'ld " "'${stdenv.cc.targetPrefix}ld " + ''; + libFolders = [ "util" "include" "lib" "build-tools" ]; buildPhase = lib.optionalString libOnly '' diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix new file mode 100644 index 000000000000..bea9f86fc90d --- /dev/null +++ b/pkgs/development/libraries/kuserfeedback/default.nix @@ -0,0 +1,23 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, qttools +}: +mkDerivation rec { + pname = "kuserfeedback"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ="; + }; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + meta = with lib; { + license = [ licenses.mit ]; + maintainers = [ maintainers.k900 ]; + description = "Framework for collecting user feedback for apps via telemetry and surveys"; + }; +} diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 506be9193228..bdc173507c05 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { (lib.enableFeature frontendSupport "dynamic-frontends") #(enableFeature mp3xSupport "mp3x") (lib.enableFeature mp3rtpSupport "mp3rtp") - (if debugSupport then "--enable-debug=alot" else "") + (lib.optionalString debugSupport "--enable-debug=alot") ]; preConfigure = '' diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index d81e3eeabe6d..bdd630103e37 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,15 +12,16 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, libxcrypt }: stdenv.mkDerivation rec { pname = "ldb"; - version = "2.3.0"; + version = "2.6.1"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4"; + sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 + tdb + tevent ]; buildInputs = [ @@ -42,8 +45,16 @@ stdenv.mkDerivation rec { tevent popt cmocka + libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 448a22f54997..fd020603b523 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.82.0"; + version = "1.83.0"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVMC7pFGaMJ7b+PKn/LaY7JF9tYvMGHI8nVjd0uK4tY="; + sha256 = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index b301ac13c2d8..56af02785979 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf" + "-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf" "-DUSE_INCLUDED_ZLIB=OFF" "-DUSE_INCLUDED_LIBZIP=OFF" "-DUSE_INCLUDED_GTEST=OFF" @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { postPatch = '' # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in + sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in + # replace bundled binaries for i in AutomaticComponentToolkit/bin/act.*; do diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 7b08005133ad..d6917fe7f2da 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.1"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-FJmH/DTTn01UlATgxC0d7vrpVLwAot6Y4cZralQz2nU="; + hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 9df992a5763d..8e68ea3f9cb6 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/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/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 3a00ca498cbe..e2fbb3f9287c 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ npth gettext ]; configureFlags = [ + # Required for cross-compilation. "--with-libgpg-error-prefix=${libgpg-error.dev}" ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index a0d6d8db3a7c..719f1b3e4275 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libayatana-appindicator"; - version = "0.5.91"; + version = "0.5.92"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; rev = version; - sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys="; + sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA="; }; nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ]; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index a461f5039aa7..9e507188aad3 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -4,16 +4,17 @@ , autoreconfHook , libtool , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; @@ -29,11 +30,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "The BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; + pkgConfigModules = [ "libb2" ]; platforms = platforms.all; maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 4b2c48824fb7..e5e51a447b48 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -46,6 +46,11 @@ in stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index d03783f2fd90..11c8ce9e097e 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE="; }; + outputs = [ "out" "dev" "doc" ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 7abbd944ed01..8f8e33cbeab4 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -13,28 +13,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.10.0"; + version = "unstable-2023-01-29"; # Musl fix hasn't been released yet. src = fetchFromGitHub { owner = "PJK"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-YJSIZ7o191/0QJf1fH6LUYykS2pvP17knSeRO2WcDeM="; + repo = "libcbor"; + rev = "cb4162f40d94751141b4d43b07c4add83e738a68"; + sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DBUILD_SHARED_LIBS=on" - ] ++ lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON"; + cmakeFlags = lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON" + ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; - # 2 tests are not 32-bit clean: overflow size_t: - # https://github.com/PJK/libcbor/issues/263 - doCheck = - !stdenv.hostPlatform.is32bit - && (!stdenv.hostPlatform.isStatic) + # Tests are restricted while pkgsStatic.cmocka is broken. Tracked at: + # https://github.com/NixOS/nixpkgs/issues/213623 + doCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform == stdenv.buildPlatform; + nativeCheckInputs = [ cmocka ]; passthru.tests = { diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 36b591b0605b..bd39cfb71cb3 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/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/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index da076a590e19..6e38c1ab84f1 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=address" + ]; + meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 50fc23aa5f10..821c73955669 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-kg/dVarfmDibZXLGY4zXfReNQ1DC4T/3g54g8zxNmEs="; + sha256 = "sha256-gyGlx43LdBkZvwN8EeZvaLzdTgYT3PFnSX9eZyAWNc4="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch index e12b584d16eb..19aa27b549c2 100644 --- a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch +++ b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch @@ -17,7 +17,7 @@ index 4486e7b2..be5b28b4 100644 if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.2 2.3" ++ accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4" AC_PATH_PROGS(GNUPG, [gpg gpg2], no) AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) ok="no" diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 257673b1a96d..57d30124a6fd 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; preAutoreconf = let reports = "https://github.com/tlwg/libdatrie/issues"; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 7b0fca858399..9efea659a651 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/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/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 18b8d6ba5d6f..7cbcbe238ea1 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config @@ -12,16 +13,25 @@ }: stdenv.mkDerivation rec { - version = "1.0.9"; + version = "1.0.10"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "sha256-OpiQapppuKCR27tIG5OW+KiNMP9ysv7CaobiBOW6VUI="; + sha256 = "sha256-d2TJKPvOAqLe+ZO1+Rd/yRIn3W1u1q62ZH20/9N2Shw="; }; + patches = [ + (fetchpatch { + name = "revert-cmake-change-pkg-config.patch"; + url = "https://github.com/strukturag/libde265/commit/388b61459c2abe2b949114ab54e83fb4dbfa8ba0.patch"; + sha256 = "sha256-b6wwSvZpK7lIu0uD1SqK2zGBUjb/25+JW1Pf1fvHc0I="; + revert = true; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 7d8b1c95698a..cd0320184b0f 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.107.0"; + version = "1.108.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; + hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; + hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 35637512e0a5..0cba50c3a924 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/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/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/development/libraries/libdisplay-info/default.nix new file mode 100644 index 000000000000..fa499a001464 --- /dev/null +++ b/pkgs/development/libraries/libdisplay-info/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, pkg-config +, ninja +, python3 +, hwdata +, edid-decode +}: + +stdenv.mkDerivation rec { + pname = "libdisplay-info"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = pname; + rev = version; + sha256 = "sha256-jfi7RpEtyQicW0WWhrQg28Fta60YWxTbpbmPHmXxDhw="; + }; + + nativeBuildInputs = [ meson pkg-config ninja edid-decode python3 ]; + + buildInputs = [ hwdata ]; + + postPatch = '' + patchShebangs tool/gen-search-table.py + ''; + + meta = with lib; { + description = "EDID and DisplayID library"; + homepage = "https://gitlab.freedesktop.org/emersion/libdisplay-info"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pedrohlc ]; + }; +} diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index b418279e477b..6018e00f944e 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -15,14 +15,17 @@ stdenv.mkDerivation rec { "-DDYND_BUILD_BENCHMARKS=OFF" ]; - # added to fix build with gcc7+ NIX_CFLAGS_COMPILE = builtins.toString [ + # added to fix build with gcc7+ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" "-Wno-error=tautological-compare" "-Wno-error=class-memaccess" "-Wno-error=parentheses" "-Wno-error=deprecated-copy" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=maybe-uninitialized" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 196ac1afaae5..8b35097778de 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dtests=${if doCheck then "true" else "false"}" + "-Degl=${if x11Support then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" + "-Dtests=${lib.boolToString doCheck}" + "-Dx11=${lib.boolToString x11Support}" ]; NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index ac501c660b02..e58c74f2c675 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, perl, coreutils }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "wolfcw"; repo = "libfaketime"; rev = "v${version}"; - sha256 = "sha256-P1guVggteGtoq8+eeE966hDPkRwsn0m7oLCohyPrIb4="; + sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="; }; patches = [ - ./no-date-in-gzip-man-page.patch ./nix-store-date.patch + (fetchpatch { + name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; + sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; + }) ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/development/libraries/libfaketime/nix-store-date.patch index b88245dfe8fb..e93a7ec76507 100644 --- a/pkgs/development/libraries/libfaketime/nix-store-date.patch +++ b/pkgs/development/libraries/libfaketime/nix-store-date.patch @@ -13,9 +13,9 @@ index af618f2..48e47da 100644 +++ b/src/faketime.c @@ -50,11 +50,7 @@ - const char version[] = "0.9.9"; + const char version[] = "0.9.10"; --#ifdef __APPLE__ +-#if (defined __APPLE__) || (defined __sun) -static const char *date_cmd = "gdate"; -#else -static const char *date_cmd = "date"; diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch deleted file mode 100644 index 7b7e362fbf0f..000000000000 --- a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libfaketime-0.9.5.orig/man/Makefile libfaketime-0.9.5/man/Makefile ---- libfaketime-0.9.5.orig/man/Makefile 2013-10-13 11:19:30.000000000 +0200 -+++ libfaketime-0.9.5/man/Makefile 2014-04-13 01:22:14.362296519 +0200 -@@ -6,7 +6,7 @@ - - install: - $(INSTALL) -Dm0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" -- gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" -+ gzip -9nf "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" - - uninstall: - rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz" diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 9384a7c97603..6fe2f398b25e 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/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/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index bf43bb1b50e4..0b983e6edf41 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-yXSuG8UwD5KZbn4ysDStTdOGD4uHigjOhazlHT9ndNs="; + sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 3f5a5961ba0f..775bcf2f2a43 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "2.32.0"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -14,9 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; -} +}) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index fcd7946a1351..d8c5d87b1656 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,17 +17,22 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.45"; + version = "1.46"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Vw+O5PtL/3t0lc/5IMJ1ACrqIUfpodIgwGghMmf4CiY="; + sha256 = "sha256-t+EaZCRrvl7zd0jeQ7JFq9cs/NU8muXn/FylnxyBJo0="; }; postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure ''; + configureFlags = [ + # See https://dev.gnupg.org/T6257#164567 + "--enable-install-gpg-error-config" + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # deps want just the lib, most likely diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index f1b6d18a86b2..56a8e59433cd 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/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/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 5ae0c2b7edb0..76e471e0c648 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/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/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 254e5ca51e99..95d615c5d24d 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/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/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index 682ff485d65c..c0d24cb3cdf5 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib +, stdenv +, fetchzip +, autoreconfHook +, dos2unix +}: stdenv.mkDerivation rec { pname = "libpgf"; - version = "7.21.2"; + version = "7.21.7"; src = fetchzip { url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip"; - sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r"; + hash = "sha256-TAWIuikijfyeTRetZWoMMdB/FeGAR7ZjNssVxUevlVg="; }; - nativeBuildInputs = [ autoreconfHook ]; - - autoreconfPhase = '' + postPatch = '' + find . -type f | xargs dos2unix mv README.txt README - sh autogen.sh ''; + nativeBuildInputs = [ + autoreconfHook + dos2unix + ]; + meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 3dddc02aeabd..10a12dbfa771 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -25,11 +25,11 @@ let ; in stdenv.mkDerivation rec { pname = "libpsl"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; - sha256 = "1a9kp2rj71jb9q030lmp3zhy33rqxscawbfzhp288fxvazapahv4"; + sha256 = "sha256-qj1wbEUnhtE0XglNriAc022B8Dz4HWNtXPwQ02WQfxc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 758b00febf5f..26d7616ba8f0 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.2.p2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch - sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja"; + rev = version; + sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; }; outputs = [ "out" "lib" "dev" "doc" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = licenses.gpl2Plus; + license = with licenses; [ cddl lgpl2Plus ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libraw/unstable.nix b/pkgs/development/libraries/libraw/unstable.nix deleted file mode 100644 index 3f19bb53c4e6..000000000000 --- a/pkgs/development/libraries/libraw/unstable.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ libraw, fetchFromGitHub }: - -libraw.overrideAttrs (_: rec { - version = "unstable-2021-12-03"; - - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; - sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; - }; -}) diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 627b7596c029..1dd71d1e311b 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/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/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 7daa4ad19e57..a1daa89ef787 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/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/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index dd202d4a2954..b1cb2fc4570c 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.10.0"; + version = "0.10.4"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DcFYxTTNg4rQt4WoLexYbeQNp+CWUjrmwIybe9KvC1c="; + sha256 = "sha256-BzksVKthR2KI0cHwp8VXtQIReXrQDDTDryu8TbxL2X0="; }; postPatch = '' diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 892ed71583d3..f2147632eb7c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , nix-update-script , autoreconfHook @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch + (fetchpatch { + name = "CVE-2022-48281.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/d1b6b9c1b3cae2d9e37754506c1ad8f4f7b646b5.diff"; + sha256 = "sha256-FWUlyJyHXac6fuM5f9PG33kcF5Bm4fyFmYnaDal46iM="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 929e62ca2b89..c4dbc11c76c1 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; }; + # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin + # upgrades to a newer SDK. + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + patches = [ (fetchpatch { name = "CVE-2019-17362.patch"; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index bb49ad4472cf..cd8790c0e88e 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }: +{ stdenv, lib, fetchgit, cmake, pkg-config, json_c, with_lua ? false, lua5_1 }: stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2021-03-09"; + version = "unstable-2023-01-03"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "551d75b5662cccd0466b990d58136bdf799a804d"; - sha256 = "05cnjjqjv9nvrs1d8pg4xxxf27jryiv6xk8plmdpmm7r2wkvwn3r"; + rev = "eac92a4d5d82eb31e712157e7eb425af728b2c43"; + sha256 = "0w6mmwmd3ljhkqfk0qswq28dp63k30s3brlgf8lyi7vj7mrhvn3c"; }; - cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ json_c ]; + buildInputs = [ json_c ] ++ lib.optional with_lua lua5_1; meta = with lib; { description = "C utility functions for OpenWrt"; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7da2c46fafe2..8c899268f7d1 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) */ - enableParallelBuilding = false; + enableParallelChecking = false; + enableParallelBuilding = true; meta = { homepage = "https://www.gnu.org/software/libunistring/"; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c95ea31b3bfb..7a5fa8a34a12 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.2"; + version = "2.3"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g"; + sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k="; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a350cd378bce..8a86bc46d4da 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices, pkgsStatic }: stdenv.mkDerivation rec { version = "1.44.2"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-K6v+00basjI32ON27ZjC5spQi/zWCcslDwQwyosq2iY="; }; + patches = [ + # Fix tests for statically linked variant upstream PR is + # https://github.com/libuv/libuv/pull/3735 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/9d898acc564351dde74e9ed9865144e5c41f5beb.patch"; + sha256 = "sha256-6XsjrseD8a+ny887EKOX0NmHocLMXGf2YL13vkNHUZ0="; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -21,6 +30,10 @@ stdenv.mkDerivation rec { "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927 + + # Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE + # Assertion failed in test/test-tcp-bind-error.c on line 99: r == UV_EADDRINUSE + "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should @@ -66,6 +79,8 @@ stdenv.mkDerivation rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; + passthru.tests.static = pkgsStatic.libuv; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 734f96850c5d..8db7964257e8 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -269,7 +269,7 @@ stdenv.mkDerivation rec { (cfg "runstatedir" "/run") (cfg "init_script" (if isDarwin then "none" else "systemd")) - (cfg "qemu_datadir" (if isDarwin then "${qemu}/share/qemu" else "")) + (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) (feat "apparmor" isLinux) (feat "attr" isLinux) diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 3e61ee8a6a13..b58c25401c90 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, glib }: +{ lib +, stdenv +, fetchurl +, SDL +, glib +, pkg-config + # sdl-config is not available when crossing +, withExamples ? stdenv.buildPlatform == stdenv.hostPlatform +}: stdenv.mkDerivation rec { pname = "libvisual"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz"; - sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; + hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; + buildInputs = lib.optional withExamples SDL ++ [ glib ]; - hardeningDisable = [ "format" ]; - - configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ]; + configureFlags = lib.optional (!withExamples) "--disable-examples"; meta = { description = "An abstraction library for audio visualisations"; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index befbafd5a4ec..643dcb4d8f40 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" else "8" else ""}-gcc" - (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index d82bf42bef61..1d791aec6fa6 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) [ "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${kernel}-gcc" - (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index ca16063cca6b..bbbceab3ab78 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3"; + version = "0.3.1"; src = fetchurl { url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-YesNZijFK98CkA39RGiqhqGnElIourimcyiYGIdIM1g="; + sha256 = "sha256-JaitnBVIU2jf0Kip3KGuyP6lwn2j+nTsUY1dN4fww5c="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 6578a86e35b1..3997ceb623f3 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { "--with-x-locale-root=${libX11.out}/share/X11/locale" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 's/,--version-script=.*$//' Makefile ''; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index d3b7e5642546..6ba8eaf6f170 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -12,14 +12,15 @@ , openssl , withZstd ? false , zstd +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzip"; version = "1.9.2"; src = fetchurl { - url = "https://libzip.org/download/${pname}-${version}.tar.gz"; + url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; }; @@ -41,11 +42,14 @@ stdenv.mkDerivation rec { patchShebangs regress ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://libzip.org/"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; + pkgConfigModules = [ "libzip" ]; platforms = platforms.unix; changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md"; }; -} +}) diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/development/libraries/maeparser/default.nix index 73b25bb014ad..16459987c13f 100644 --- a/pkgs/development/libraries/maeparser/default.nix +++ b/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/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix new file mode 100644 index 000000000000..c98143dcc4d6 --- /dev/null +++ b/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/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix index 568f3fbe64e2..8d6c0664ca13 100644 --- a/pkgs/development/libraries/maplibre-gl-native/default.nix +++ b/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -9,6 +9,7 @@ , libuv , glfw3 , rapidjson +, stdenv }: mkDerivation rec { @@ -55,6 +56,11 @@ mkDerivation rec { "-DMBGL_WITH_QT_HEADLESS=OFF" ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=use-after-free" + ]; + meta = with lib; { description = "Open-source alternative to Mapbox GL Native"; homepage = "https://maplibre.org/"; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index d2e92da0ea96..1c08812db45c 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: +{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glu"; version = "9.0.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; }; @@ -15,11 +19,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "OpenGL utility library"; homepage = "https://cgit.freedesktop.org/mesa/glu/"; license = lib.licenses.sgi-b-20; + pkgConfigModules = [ "glu" ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; }; -} +}) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 56fa74e5c0c5..52633a6d2164 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -28,9 +28,9 @@ "tegra" # Nvidia Tegra SoCs "v3d" # Broadcom VC5 (Raspberry Pi 4) "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] ++ lib.optionals stdenv.isx86_64 [ - "iris" # new Intel, could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 - "crocus" # Intel legacy, x86_64 only + ] ++ lib.optionals stdenv.hostPlatform.isx86 [ + "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86 only ] else [ "auto" ] , vulkanDrivers ? @@ -326,10 +326,6 @@ self = stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" - - # Work around regression from https://github.com/NixOS/nixpkgs/pull/210004 - # TODO(trofi): remove - "--sysroot=/" ]; passthru = { diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix index 753ad1b91966..f3ea263cc9ff 100644 --- a/pkgs/development/libraries/mesa/stubs.nix +++ b/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/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix index 27caa1f94137..15581e00e528 100644 --- a/pkgs/development/libraries/migraphx/default.nix +++ b/pkgs/development/libraries/migraphx/default.nix @@ -7,7 +7,6 @@ , rocm-cmake , hip , clang-tools-extra -, cppcheck , openmp , rocblas , rocmlir @@ -70,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: { rocm-cmake hip clang-tools-extra - cppcheck python3Packages.python ] ++ lib.optionals buildDocs [ latex diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index ecb247de0ba4..905d8330fe4d 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -10,21 +10,35 @@ cyrus_sasl, libbson, snappy, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.1"; + version = "1.23.2"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; + sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf"; }; # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + # https://github.com/mongodb/mongo-c-driver/pull/1157 + # related: + # https://github.com/NixOS/nixpkgs/issues/144170 + # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths. + postPatch = '' + substituteInPlace src/libmongoc/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + substituteInPlace src/libbson/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; nativeBuildInputs = [cmake pkg-config perl]; - buildInputs = [openssl zlib cyrus_sasl]; + buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security]; propagatedBuildInputs = [libbson snappy]; # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF @@ -35,6 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 0f358c279628..987f4022f511 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/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/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 4caf05ef3cfe..4e2c731d7e2b 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/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/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee05d2606def..c7977ed89d99 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,38 +6,37 @@ , python3 , python3Packages , wafHook -, boost175 +, boost , openssl , sqlite }: stdenv.mkDerivation rec { pname = "ndn-cxx"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; rev = "${pname}-${version}"; - sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE="; + sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost175 openssl sqlite ]; + buildInputs = [ boost openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - - doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment checkPhase = '' runHook preCheck - LD_PRELOAD=build/ndn-cxx.so build/unit-tests + LD_PRELOAD=build/libndn-cxx.so build/unit-tests runHook postCheck ''; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 6114c4c70d0f..3ba07c7b5be9 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "newt"; - version = "0.52.21"; + version = "0.52.23"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; + sha256 = "sha256-yqNykHsU7Oz+KY8NUSpi9B0zspBhAkSliu0Hu8WtoSo="; }; postPatch = '' diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index af83fb29c01e..2810114cb6ba 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/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/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index d6cacc0aa7f7..3ea84895eb9b 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/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/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 7f0bd15aa542..d7b021e7c494 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/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/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 6f3e73639b9e..0a74f9a38657 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.87"; - hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0="; + version = "3.88.1"; + hash = "sha256-J9JD7fh9HPG7nIYfA9OH4OkjDOUBf0MIyUH1WLVLNJY="; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index a6974295690e..324c5269dfbc 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.12"; + version = "1.1.15"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; + sha256 = "sha256-Nvh0gypPIVjgT2mqd+VRXhbPbjv4GWjV3YSW231pBq0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix index 9b1635511ec6..5a2064eb595d 100644 --- a/pkgs/development/libraries/octomap/default.nix +++ b/pkgs/development/libraries/octomap/default.nix @@ -10,10 +10,16 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; + sourceRoot = "source/octomap"; nativeBuildInputs = [ cmake ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + ]; + meta = with lib; { description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems"; homepage = "https://octomap.github.io/"; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 63174807829e..e5b5d1acc029 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "13.6.1"; + version = "13.6.2"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U="; + hash = "sha256-4Jmhseg1+4g0b8Pa8A4YL+ixYMe/HxzXrDaXUfElh+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 3e989561470c..0cc752d993fb 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + sed '1i#include ' -i include/openbabel/obutil.h # gcc12 + ''; + buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index a23382d3f892..fe12bbffa531 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; }; + postPatch = '' + sed '1i#include ' -i include/openbabel/obutil.h # gcc12 + ''; + buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 5afc209922b5..4a9af9a5388f 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -15,6 +15,7 @@ , ocl-icd , buildPackages , qimgv +, opencv4 , enableJPEG ? true , libjpeg @@ -31,8 +32,8 @@ , openjpeg , enableEigen ? true , eigen -, enableOpenblas ? true -, openblas +, enableBlas ? true +, blas , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 @@ -48,7 +49,7 @@ , enableGtk3 ? false , gtk3 , enableVtk ? false -, vtk_8 +, vtk , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true @@ -74,6 +75,7 @@ , CoreMedia , MediaToolbox , bzip2 +, callPackage }: let @@ -93,6 +95,13 @@ let sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; }; + testDataSrc = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_extra"; + rev = version; + sha256 = "sha256-6hAdJdaUgtRGQanQKuY/q6fcXWXFZ3K/oLbGxvksry0="; + }; + # Contrib must be built in order to enable Tesseract support: buildContrib = enableContrib || enableTesseract || enableOvis; @@ -171,10 +180,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - sha256 = "04n9na2bph706bdxnnqfcbga4cyj8kd9s9ni7qyvnpj5v98jwvlm"; + sha256 = "sha256-TjLRbFbC7MDY9PxIy560ryviBI58cbQwqgc7A7uOHkg="; }; - name = "v0.1.1f.zip"; - md5 = "b624b995ec9c439cbc2e9e6ee940d3a2"; + name = "v0.1.2a.zip"; + md5 = "fa4b3e25167319cb0fa9432ef8281945"; dst = ".cache/ade"; }; @@ -208,13 +217,24 @@ let opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; + runAccuracyTests = true; + runPerformanceTests = false; printEnabled = enabled: if enabled then "ON" else "OFF"; + withOpenblas = (enableBlas && blas.provider.pname == "openblas"); + #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests + #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded + openblas_ = blas.provider.override { singleThreaded = true; }; in stdenv.mkDerivation { pname = "opencv"; inherit version src; + outputs = [ + "out" + "package_tests" + ]; + postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; @@ -253,7 +273,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 @@ -263,12 +283,12 @@ stdenv.mkDerivation { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] - ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ lib.optional enableOvis ogre ++ lib.optional enableGPhoto2 libgphoto2 ++ lib.optional enableDC1394 libdc1394 ++ lib.optional enableEigen eigen - ++ lib.optional enableOpenblas openblas + ++ lib.optional enableBlas blas.provider # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. @@ -290,7 +310,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. - OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; + OpenBLAS = lib.optionalString withOpenblas openblas_; cmakeFlags = [ "-DOPENCV_GENERATE_PKGCONFIG=ON" @@ -299,8 +320,9 @@ stdenv.mkDerivation { "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" - "-DBUILD_TESTS=OFF" - "-DBUILD_PERF_TESTS=OFF" + "-DBUILD_TESTS=${printEnabled runAccuracyTests}" + "-DBUILD_PERF_TESTS=${printEnabled runPerformanceTests}" + "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DBUILD_DOCS=${printEnabled enableDocs}" # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" # but we have proper separation of build and host libs :), fixes cross @@ -334,6 +356,14 @@ stdenv.mkDerivation { make doxygen ''; + preInstall = + lib.optionalString (runAccuracyTests || runPerformanceTests) '' + mkdir $package_tests + cp -R $src/samples $package_tests/ + '' + + lib.optionalString runAccuracyTests "mv ./bin/*test* $package_tests/ \n" + + lib.optionalString runPerformanceTests "mv ./bin/*perf* $package_tests/"; + # By default $out/lib/pkgconfig/opencv4.pc looks something like this: # # prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0 @@ -368,16 +398,23 @@ stdenv.mkDerivation { passthru = { tests = { - inherit qimgv; inherit (gst_all_1) gst-plugins-bad; - } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }; + } + // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; } + // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } + // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") { + opencv4-tests = callPackage ./tests.nix { + inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; + inherit opencv4; + }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [ mdaiter basvandijk ]; + maintainers = with maintainers; [ basvandijk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix new file mode 100644 index 000000000000..5a155a9119b0 --- /dev/null +++ b/pkgs/development/libraries/opencv/tests.nix @@ -0,0 +1,70 @@ +{ opencv4 +, testDataSrc +, stdenv +, lib +, runCommand +, gst_all_1 +, runAccuracyTests +, runPerformanceTests +, enableGStreamer +, enableGtk2 +, enableGtk3 +, xvfb-run +}: +let + testNames = [ + "calib3d" + "core" + "features2d" + "flann" + "imgcodecs" + "imgproc" + "ml" + "objdetect" + "photo" + "stitching" + "video" + #"videoio" # - a lot of GStreamer warnings and failed tests + #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models + ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ] + ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ]; + perfTestNames = [ + "calib3d" + "core" + "features2d" + "imgcodecs" + "imgproc" + "objdetect" + "photo" + "stitching" + "video" + ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; + testRunner = if stdenv.isDarwin then "" else "${lib.getExe xvfb-run} -a "; + testsPreparation = '' + touch $out + # several tests want a write access, so we have to copy files + tmpPath="$(mktemp -d "/tmp/opencv_extra_XXXXXX")" + cp -R ${testDataSrc} $tmpPath/opencv_extra + chmod -R +w $tmpPath/opencv_extra + export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata" + export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data" + + #ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" + export GTEST_FILTER="-AsyncAPICancelation/cancel*" + ''; + accuracyTests = lib.optionalString runAccuracyTests '' + ${ builtins.concatStringsSep "\n" + (map (test: "${testRunner}${opencv4.package_tests}/opencv_test_${test} --test_threads=$NIX_BUILD_CORES --gtest_filter=$GTEST_FILTER" ) testNames) + } + ''; + perfomanceTests = lib.optionalString runPerformanceTests '' + ${ builtins.concatStringsSep "\n" + (map (test: "${testRunner}${opencv4.package_tests}/opencv_perf_${test} --perf_impl=plain --perf_min_samples=10 --perf_force_samples=10 --perf_verify_sanity --skip_unstable=1 --gtest_filter=$GTEST_FILTER") perfTestNames) + } + ''; +in +runCommand "opencv4-tests" +{ + nativeBuildInputs = lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); +} + (testsPreparation + accuracyTests + perfomanceTests) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 0460f012424c..ce8064cdc1eb 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient postgresql sqlite ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-std=c++14" + ]; + meta = with lib; { broken = stdenv.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 26a7676dd615..c016b7635aa1 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/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/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix index 10f6abd79ef8..7b2901b69b76 100644 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 8d02b976c91f..532ee7a09571 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch deleted file mode 100644 index 2acedda0e3a4..000000000000 --- a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli -Date: Fri, 11 Nov 2022 09:40:19 +1100 -Subject: [PATCH] x509: fix double locking problem - -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the -redundant flag setting. - -Fixes #19643 - -Fixes LOW CVE-2022-3996 - -Reviewed-by: Dmitry Belyavskiy -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/19652) - -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) ---- - crypto/x509/pcy_map.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c -index 05406c6493fc..60dfd1e3203b 100644 ---- a/crypto/x509/pcy_map.c -+++ b/crypto/x509/pcy_map.c -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - - ret = 1; - bad_mapping: -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { -- x->ex_flags |= EXFLAG_INVALID_POLICY; -- CRYPTO_THREAD_unlock(x->lock); -- } - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); - return ret; - diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4c322997963a..efa19a2ce197 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev +, withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic @@ -10,6 +11,7 @@ # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null , removeReferencesTo +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -19,12 +21,12 @@ let common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; + url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; inherit sha256; }; @@ -74,7 +76,8 @@ let buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. - ++ lib.optional withPerl perl; + ++ lib.optional withPerl perl + ++ lib.optional withZlib zlib; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -141,6 +144,7 @@ let # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" + ++ lib.optional withZlib "zlib" ; makeFlags = [ @@ -204,20 +208,27 @@ let fi ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; + pkgConfigModules = [ + "libcrypto" + "libssl" + "openssl" + ]; platforms = platforms.all; } // extraMeta; - }; + }); in { openssl_1_1 = common { - version = "1.1.1s"; - sha256 = "sha256-xawB52Dub/Dath1rK70wFGck0GPrMiGAxvGKb3Tktqo="; + version = "1.1.1t"; + sha256 = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -229,8 +240,8 @@ in { }; openssl_3 = common { - version = "3.0.7"; - sha256 = "sha256-gwSdBComDmlvYkBqxcCL9wb9hDg/lFzyG9YentlcOW4="; + version = "3.0.8"; + sha256 = "sha256-bBPSvzj98x6sPOKjRwc2c/XWMmM5jx9p0N9KQSU+Sz4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -241,9 +252,6 @@ in { (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) - - # Remove with 3.0.8 release - ./3.0/CVE-2022-3996.patch ]; withDocs = true; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 46bbc079aeb8..9511f4f56f7e 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ="; + sha256 = "sha256-pYD2HxAszE9Ux1xsSJ7s2R13U8ct5tDo3ZP7H0+F9Rc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/openvino/cmake.patch b/pkgs/development/libraries/openvino/cmake.patch new file mode 100644 index 000000000000..0918baba918f --- /dev/null +++ b/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/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index e3ebb97cbdff..2f8ecd5fc81e 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/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/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 512398dde9a1..105a6b4953f7 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.in \ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" - '' + (if stdenv.isDarwin then '' + '' + (lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile.in \ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" - '' else ""); + ''); enableParallelBuilding = false; # broken diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index a8d853a23b04..b3ba508220f5 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.3"; + version = "2.4.6.4"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-/NAH8RsQukryjQJyIrYxSNDrRP96CC7uNTvfkh+caEo="; + hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; }; prePatch = '' diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 60b5a0b581dc..00f548806fc5 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; }; + patches = [ + # avoid silent compilation failures + (fetchpatch { + name = "lhapdf-propagate_returncode.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; + hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; + }) + + # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin + (fetchpatch { + name = "lhapdf-Wl_stack_size.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; + hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; + }) + ]; + # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 991d2e661f14..8b5f33599cd2 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; + sha256 = "sha256-p69go8KXQR21szPb+R1xuonyFj+ZJDunNeoU7M3zIsE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index df42dea81a5c..9c526b6fdce4 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/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/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8da35364e2b8..53d465542b2b 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -109,8 +109,16 @@ let url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705.patch"; hash = "sha256-aZQ4OzK0B5YPq+jQNygxPE0coG2qB0ukbYzyI8E24XM="; }) + + # backport a fix for rust-cbindgen errors in downstream packages + # See https://github.com/NixOS/nixpkgs/pull/211872#issuecomment-1415981135 for details. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/caf58ecffb4dc8e2bfa7898d0ed910cf0a82d65f.patch"; + hash = "sha256-kCQNG0j3lwT01WNfGsdUmKvDHg8tvMfS2eunPyXBV1E="; + }) ]; + strictDeps = true; nativeBuildInputs = [ docutils doxygen @@ -119,6 +127,7 @@ let ninja pkg-config python3 + glib ]; buildInputs = [ diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 8ed0c7a744be..5479502abb23 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }: stdenv.mkDerivation rec { pname = "platform-folders"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index ccae3037e092..d99e5150678e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/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/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 207017b5edd5..dfe2a6d7a965 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -79,7 +79,12 @@ let "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ]; + ] + # Tests fail to build on 32-bit platforms; fixed in 3.22 + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optional + (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") + "-Dprotobuf_BUILD_TESTS=OFF"; # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail doCheck = false; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 130f681d8496..cbe669ffd377 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/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/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 4a288702e2f2..fb5c7570b75b 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -1,5 +1,5 @@ { stdenv -, gcc11Stdenv +, gcc12Stdenv , lib , fetchFromGitHub , cmake @@ -9,7 +9,7 @@ , wrapQtAppsHook }: -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "qcoro"; version = "0.7.0"; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 2829bb0be027..7d876d884b37 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -64,6 +64,12 @@ let extraPrefix = "src/3rdparty/"; hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-gcc12.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 19f36c337e5c..0603ae077e47 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -42,7 +42,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) qtwebengine = let - branchName = "5.15.11"; + branchName = "5.15.12"; rev = "v${branchName}-lts"; in { @@ -50,7 +50,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "sha256-yrKPof18G10VjrwCn/4E/ywlpATJQZjvmVeM+9hLY0U="; + sha256 = "sha256-8EQqSvxw9rqf+64CIbcCb1VXhNx1GNC8eDIgLyYDyvk="; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 44f72701854c..b718f69610d4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -24,13 +24,14 @@ , debug ? false , developerBuild ? false , decryptSslTraffic ? false +, testers }: let debugSymbols = debug || developerBuild; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; @@ -338,12 +339,33 @@ stdenv.mkDerivation { setupHook = ../hooks/qtbase-setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; + pkgConfigModules = [ + "Qt5Concurrent" + "Qt5Core" + "Qt5DBus" + "Qt5Gui" + "Qt5Network" + "Qt5OpenGL" + "Qt5OpenGLExtensions" + "Qt5PrintSupport" + #"Qt5Qml" + #"Qt5QmlModels" + #"Qt5Quick" + #"Qt5QuickTest" + #"Qt5QuickWidgets" + "Qt5Sql" + "Qt5Test" + "Qt5Widgets" + "Qt5Xml" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 6da193bbd5fc..e71b0a7613d9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/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/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index b52837aa1705..1c39c004447e 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + hash = "sha256-5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index f50f47413b4a..4d0cbafe3731 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + sha256 = "5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index f43a91766524..4221d24679c3 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/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/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 5676f54d4f35..a9c07232035f 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.7+quic1"; + version = "3.0.8+quic"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${version}"; - sha256 = "sha256-ZRS0ZV+/U4PD2lVE+PsUAWSuk5EFg5mOKYlwgY3Ecus="; + sha256 = "sha256-6t23EY+Gk/MvLOcYpDbL5jEr0rMaaPYOsc+12WFgv1c="; }; patches = [ diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 4867c67277d8..aede57810aa2 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/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/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index b5324abd6ced..a500e5dbc045 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rabbitmq-c"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "sha256-u1uOrZRiQOU/6vlLdQHypBRSCo3zw7FC1AI9v3NlBVE="; + sha256 = "sha256-4tSZ+eaLZAkSmFsGnIrRXNvn3xA/4sTKyYZ3hPUMcd0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 057baafdc610..79cd1b86fadb 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -8,7 +9,9 @@ , snappy , zlib , zstd -, enableJemalloc ? false, jemalloc +, windows +, enableJemalloc ? false +, jemalloc , enableLite ? false , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support @@ -29,15 +32,24 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - buildInputs = lib.optional enableJemalloc jemalloc; + buildInputs = lib.optional enableJemalloc jemalloc + ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; outputs = [ "out" "tools" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move" - + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation"; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + "-Wno-error=deprecated-copy" + "-Wno-error=pessimizing-move" + # Needed with GCC 12 + "-Wno-error=format-truncation" + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=unused-private-field" + "-faligned-allocation" + ]; cmakeFlags = [ "-DPORTABLE=1" @@ -65,7 +77,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $tools/bin - cp tools/{ldb,sst_dump} $tools/bin/ + cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ '' + lib.optionalString stdenv.isDarwin '' ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.7.dylib" $out/lib/librocksdb.dylib {} '' + lib.optionalString (stdenv.isLinux && enableShared) '' diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 8ec90b1f1e27..d475a9f9dce2 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -15,7 +15,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 3fba6da7f537..fa60a4d3f9e4 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -14,7 +14,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 114245b7d715..225236b0a961 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 345a8c8d25d6..d10f7811ccbb 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.4.1"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index a083f57722db..f22a72ac2b3e 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index 1b83ba1e28dd..5128e17376c3 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY="; + hash = "sha256-xK1JRTW+7odlXRQV9WC6ZfXqRKow/TQ9grHCigw+/us="; fetchSubmodules = true; # For inline hipRAND }; diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix index ee844bb417ba..74d32f443062 100644 --- a/pkgs/development/libraries/roctracer/default.nix +++ b/pkgs/development/libraries/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -62,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + postPatch = '' export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode '' + lib.optionalString (!buildTests) '' diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index f9a12322c47b..afb872287413 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.34"; + version = "1.3.36"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CaVo2OxfB7ImMOgPuyvKQFbTeEm3PqD8CV96jUEZ8U0="; + sha256 = "sha256-IL7+f+7Igvm7KeBpDwnIoIB8IUqg3JDEtLFQslBIENE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index c4faadd2a5eb..7144a17c18b4 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/firmware" "lib/firmware" done + + sed '1i#include ' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 ''; cmakeFlags = [ diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix new file mode 100644 index 000000000000..54c0d03979ab --- /dev/null +++ b/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/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/pkgs/development/libraries/science/chemistry/libGDSII/default.nix new file mode 100644 index 000000000000..c3257bad3e26 --- /dev/null +++ b/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/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index cd105a1133d0..85072f77da12 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/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/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index 0fcf4a6c04e6..6ac453aec2c0 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/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/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index f04087302825..962e8e8e6ace 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -16,7 +16,7 @@ }: let - threadingSuffix = if withOpenMP then "-mt" else ""; + threadingSuffix = lib.optionalString withOpenMP "-mt"; blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "amd-blis"; diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index ac22faeabb02..dc538411211b 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -68,12 +68,47 @@ final: prev: let supportedCudaVersions = [ "10.2" ]; } ]; + "8.0.5" = [ + rec { + fileVersion = "10.1"; + fullVersion = "8.0.5.39"; + hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "10.1" ]; + } + rec { + fileVersion = "10.2"; + fullVersion = "8.0.5.39"; + hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.0"; + fullVersion = "8.0.5.39"; + hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "11.0" ]; + } + rec { + fileVersion = "11.1"; + fullVersion = "8.0.5.39"; + hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "11.1" ]; + } + ]; "8.1.1" = [ rec { fileVersion = "10.2"; fullVersion = "8.1.1.33"; hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811 supportedCudaVersions = [ "10.2" ]; } rec { @@ -81,38 +116,61 @@ final: prev: let fullVersion = "8.1.1.33"; hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "11.2" ]; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811 + supportedCudaVersions = [ "11.0" "11.1" "11.2" ]; } ]; - "8.3.2" = [ + "8.2.4" = [ rec { fileVersion = "10.2"; - fullVersion = "8.3.2.44"; - hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; + fullVersion = "8.2.4.15"; + hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.4"; + fullVersion = "8.2.4.15"; + hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" ]; + } + ]; + "8.3.3" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.3.3.40"; + hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { fileVersion = "11.5"; - fullVersion = "8.3.2.44"; - hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; + fullVersion = "8.3.3.40"; + hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; } ]; - "8.4.0" = [ + "8.4.1" = [ rec { fileVersion = "10.2"; - fullVersion = "8.4.0.27"; - hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ="; + fullVersion = "8.4.1.50"; + hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { fileVersion = "11.6"; - fullVersion = "8.4.0.27"; - hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA="; + fullVersion = "8.4.1.50"; + hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; } ]; @@ -122,6 +180,7 @@ final: prev: let fullVersion = "8.5.0.96"; hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { @@ -129,6 +188,7 @@ final: prev: let fullVersion = "8.5.0.96"; hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; } ]; @@ -138,6 +198,7 @@ final: prev: let fullVersion = "8.6.0.163"; hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { @@ -145,6 +206,25 @@ final: prev: let fullVersion = "8.6.0.163"; hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; + } + ]; + "8.7.0" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.7.0.84"; + hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.8"; + fullVersion = "8.7.0.84"; + hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; } ]; @@ -153,17 +233,17 @@ final: prev: let # Default attributes cuDnnDefaultVersion = { "10.0" = "7.4.2"; - "10.1" = "7.6.5"; - "10.2" = "8.6.0"; - "11.0" = "8.6.0"; - "11.1" = "8.6.0"; - "11.2" = "8.6.0"; - "11.3" = "8.6.0"; - "11.4" = "8.6.0"; - "11.5" = "8.6.0"; - "11.6" = "8.6.0"; - "11.7" = "8.6.0"; - "11.8" = "8.6.0"; - }.${cudaVersion} or "8.6.0"; + "10.1" = "8.0.5"; + "10.2" = "8.7.0"; + "11.0" = "8.7.0"; + "11.1" = "8.7.0"; + "11.2" = "8.7.0"; + "11.3" = "8.7.0"; + "11.4" = "8.7.0"; + "11.5" = "8.7.0"; + "11.6" = "8.7.0"; + "11.7" = "8.7.0"; + "11.8" = "8.7.0"; + }.${cudaVersion} or "8.7.0"; in cuDnnPackages diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index b9563346ada4..3bf16057f835 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -6,16 +6,17 @@ , shared ? true # Compile with ILP64 interface , blas64 ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; version = "3.11"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI="; }; @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = let canonicalExtension = if stdenv.hostPlatform.isLinux - then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major finalAttrs.version}" else stdenv.hostPlatform.extensions.sharedLibrary; in lib.optionalString blas64 '' ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} @@ -65,15 +66,18 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ctest ${ctestArgs} + ctest ${finalAttrs.ctestArgs} runHook postCheck ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; maintainers = with maintainers; [ markuskowa ]; license = licenses.bsd3; + pkgConfigModules = [ "lapack" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index eeb1d14b910a..fbd9db6a419f 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -5,7 +5,7 @@ }: let - dbg = if debugEnable then "-dbg" else ""; + dbg = lib.optionalString debugEnable "-dbg"; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; isOpenmpi = mpiSupport && mpi.pname == "openmpi"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; preConfigure = '' echo "2.8.0" > .tarball-version - ${if mpiSupport then "unset CC" else ""} + ${lib.optionalString mpiSupport "unset CC"} ''; configureFlags = [ "--enable-pthread=-pthread" ] diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 9396a9144423..a55c5fe573bf 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -9,7 +9,7 @@ let inherit (p4est-sc) debugEnable mpiSupport; - dbg = if debugEnable then "-dbg" else ""; + dbg = lib.optionalString debugEnable "-dbg"; withMetis = p4est-withMetis; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index ae95fefe0e63..c2fabae1c20b 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { "--with-fc=mpif90" "--with-mpi=1" ''} - ${if withp4est then '' + ${lib.optionalString withp4est '' "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" "--with-zlib-lib=-L${zlib}/lib -lz" - '' else ""} + ''} "--with-blas=1" "--with-lapack=1" ) diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index c31c705d39d0..09ca356ccdc5 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , makeWrapper , which , autoconf @@ -20,7 +21,14 @@ stdenv.mkDerivation rec { sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; - patches = [ ./clean-extra-logfile-output-from-pari.patch ]; + patches = [ + ./clean-extra-logfile-output-from-pari.patch + (fetchpatch { + name = "null-terminate-dupdirname.patch"; + url = "https://gitlab.com/rezozer/forks/sympow/-/merge_requests/5.diff"; + sha256 = "sha256-yKjio+qN9teL8L+mb7WOBN/iv545vRIxW20FJU37oO4="; + }) + ]; postUnpack = '' patchShebangs . diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix index bde530dd9d75..ad1eb0bb276d 100644 --- a/pkgs/development/libraries/sealcurses/default.nix +++ b/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/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 9f04cee3869a..e46be7a58ea0 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE="; + sha256 = "sha256-KyxtAOKhk3p/TuA0jz2hMCkGDwKLPC7rIodhHvcE4tk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index bd4dc73c1e5d..8fc18d17a499 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.12"; + version = "1.13.13"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM="; + sha256 = "sha256-ZFQmm1GX7Uptyb9pIdTHccpoSLO4WdZuVPnMalOcfK0="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix index f4b2ee9e9a95..aad1ee34e5c4 100644 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ b/pkgs/development/libraries/sqlitecpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, sqlite, gtest }: stdenv.mkDerivation rec { pname = "sqlitecpp"; @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cppcheck ]; buildInputs = [ sqlite gtest ]; doCheck = true; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 1ed1a05004b6..845e815be590 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildInputs = [ ncurses libiconv ]; preBuild = '' @@ -16,12 +18,22 @@ stdenv.mkDerivation rec { sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h '' + lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile - ''; + '' + # upstream builds shared library unconditionally. Also, it has no + # support for cross-compilation. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile + sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile + sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile + sed -i '/install -m 644 libstfl.so./d' Makefile + sed -i '/ln -fs libstfl.so./d' Makefile + '' ; installPhase = '' DESTDIR=$out prefix=\"\" make install - - # some programs rely on libstfl.so.0 to be present, so link it + '' + # some programs rely on libstfl.so.0 to be present, so link it + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 2c508a3735f9..28aabc03682b 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 jq ]; buildInputs = [ libX11 libXext zlib ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + "-Wno-error=uninitialized" + ]; + # Make sure we include the drivers and icd files in the output as the cmake # generated install command only puts in the spirv-tools stuff. installPhase = '' diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index fb52f75f8c10..951a3f1d3382 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo="; + sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU="; }; nativeBuildInputs = [ @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 21fddb165627..ec22952cc42b 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { pname = "tbb"; version = "2020.3"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; @@ -99,6 +101,6 @@ stdenv.mkDerivation rec { details and threading mechanisms for scalability and performance. ''; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice dizfer ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 9a534c4c1465..774168847b94 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws="; + sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4="; }; nativeBuildInputs = [ @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 568751f48aa3..7b798d00b01e 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -2,6 +2,7 @@ , fetchurl , python3 , pkg-config +, cmocka , readline , talloc , libxslt @@ -9,15 +10,16 @@ , docbook_xml_dtd_42 , which , wafHook +, libxcrypt }: stdenv.mkDerivation rec { pname = "tevent"; - version = "0.10.2"; + version = "0.13.0"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "15k6i8ad5lpxfjsjyq9h64zlyws8d3cm0vwdnaw8z1xjwli7hhpq"; + sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw="; }; nativeBuildInputs = [ @@ -32,10 +34,19 @@ stdenv.mkDerivation rec { buildInputs = [ python3 + cmocka readline # required to build python talloc + libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ @@ -43,6 +54,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 95ea916e09b9..2970fb3c84a7 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/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/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 76d8cc2ff54e..92063eb1400a 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -36,11 +36,14 @@ stdenv.mkDerivation rec { buildInputs = [ boost + ] ++ lib.optionals (!static) [ + (python3.withPackages (ps: [ps.twisted])) + ]; + + propagatedBuildInputs = [ libevent openssl zlib - ] ++ lib.optionals (!static) [ - (python3.withPackages (ps: [ps.twisted])) ]; postPatch = '' @@ -66,6 +69,11 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff"; hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; }) + (fetchpatch { + name = "thrift-install-FindLibevent.patch"; # https://github.com/apache/thrift/pull/2726 + url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff"; + hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index c7cb92440ee8..79af37f58e6f 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tl-expected-unstable"; - version = "2019-11-11"; # 5 commits ahead of version 1.0.0 + version = "2023-02-15"; # 37 commits ahead of version 1.0.0 src = fetchFromGitHub { owner = "TartanLlama"; repo = "expected"; - rev = "1d9c5d8c0da84b8ddc54bd3d90d632eec95c1f13"; + rev = "9d812f5e3b5bc68023f6e31d29489cdcaacef606"; fetchSubmodules = true; - sha256 = "0rzfn9yyg70zwpxbmv22qy0015baymi2rdd65ixmcb31fgnap68i"; + hash = "sha256-ZokcGQgHH37nmTMLmxFcun4S1RjXuXb9NfWHet8Fbc4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index da0554d49e60..518ed432b723 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -19,14 +19,10 @@ stdenv.mkDerivation rec { # udns uses a very custom build and hardcodes a .so name in a few places. # Instead of fighting with it to apply the standard dylib script, change # the right place in the Makefile itself. - postPatch = - if stdenv.isDarwin - then - '' - substituteInPlace Makefile.in \ - --replace --soname, -install_name,$out/lib/ - '' - else ""; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace --soname, -install_name,$out/lib/ + ''; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 6f27a71b3ee4..e9f67a74f9a3 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,4 +1,9 @@ -{lib, stdenv, fetchFromGitHub, cmake}: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: stdenv.mkDerivation rec { pname = "unittest-cpp"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; + patches = [ + # GCC12 Patch + (fetchpatch { + url = "https://github.com/unittest-cpp/unittest-cpp/pull/185/commits/f361c2a1034c02ba8059648f9a04662d6e2b5553.patch"; + hash = "sha256-xyhV2VBelw/uktUXSZ3JBxgG+8/Mout/JiXEZVV2+2Y="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = false; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 980d073f1281..6189fcf016de 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=parentheses" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=nonnull" + ]; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 797c32cb6d2d..c7e8a361ee16 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "sha256-OVLc3FWLBjWJnqIhhe6k+pl/HsJGzqD6xp/fXXEgRwY="; + sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index b5184bafcbff..d55d87f32164 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -162,9 +162,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + broken = stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"; }; } diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7ca5080cb74c..4b2117503bda 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { --replace "-Wl,-fatal_warnings" "" ''} touch build/config/gclient_args.gni + sed '1i#include ' -i src/heap/cppgc/prefinalizer-handler.h # gcc12 ''; llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; }; @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 715755bb9480..085fd7ee8ad0 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.2"; + version = "0.70.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA="; + sha256 = "sha256-lFcTSgLzFX/KBPfg05vbDzCZvgo86CtxOdDJioB0jyM="; }; patches = [ @@ -48,13 +48,6 @@ 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/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix new file mode 100644 index 000000000000..2dc62f299fc3 --- /dev/null +++ b/pkgs/development/libraries/wangle/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, boost +, libevent +, double-conversion +, glog +, fmt_8 +, gflags +, openssl +, fizz +, folly +, gtest +, libsodium +, zlib +}: + +stdenv.mkDerivation rec { + pname = "wangle"; + version = "2023.01.30.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "wangle"; + rev = "v${version}"; + sha256 = "sha256-pHBFX9zs1vHXveZw9HCieRuQldLrq5fwJXWzNyLx1Kg="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../wangle"; + + cmakeFlags = [ + "-Wno-dev" + ] ++ lib.optionals stdenv.isDarwin [ + "-DBUILD_TESTS=off" # Tests fail on Darwin due to missing utimensat + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + fmt_8 + libsodium + zlib + boost + double-conversion + fizz + folly + gtest + glog + gflags + libevent + openssl + ]; + + meta = with lib; { + description = "An open-source C++ networking library"; + longDescription = '' + Wangle is a framework providing a set of common client/server + abstractions for building services in a consistent, modular, and + composable way. + ''; + homepage = "https://github.com/facebook/wangle"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index d978e911c3a8..8a8c4ec059ef 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "17"; + version = "19"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-h2X78icCmnn6Y6baOxp8Xm7F2+RZZgaV2fszzi2q/iA="; + hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8d229678a3c8..bb764d641436 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/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/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 4e22df60f533..73073a6b7117 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,11 +64,12 @@ , enableGeoLocation ? true , withLibsecret ? true , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, testers }: stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.3"; + version = "2.38.5"; 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 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; + hash = "sha256-QMIMQwIidN9Yk/IrEFT6iUw+6gVzibsIruCMWwuwwac="; }; patches = lib.optionals stdenv.isLinux [ @@ -232,10 +233,17 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; + pkgConfigModules = [ + "javascriptcoregtk-4.0" + "webkit2gtk-4.0" + "webkit2gtk-web-extension-4.0" + ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 5e8adaf0c425..8877365e1dd6 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wildmidi"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Mindwerks"; repo = "wildmidi"; rev = "${pname}-${version}"; - sha256 = "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167"; + sha256 = "sha256-5El8aDpAgjrW0/4lphZEF+Hfv9Xr7J4DMk1b/Tb+0TU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 9d03d193d81c..8e0ebab220af 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -121,8 +121,8 @@ rec { }; wlroots_0_16 = generic { - version = "0.16.1"; - hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; + version = "0.16.2"; + hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 543c6fb4e055..8dbc6f87061d 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -53,25 +53,15 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.1"; + version = "3.2.2.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-k6td/8pF7ad7+gVm7L0jX79fHKwR7/qrOBpSFggyaI0="; + hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA="; }; - # Workaround for pkgsMusl.wxGTK32 failing as: - # "./src/unix/uilocale.cpp:650:37: error: ‘_NL_IDENTIFICATION_TERRITORY’ was not declared in this scope" - # On upgrade, please test building wxwidgets for pkgsMusl, and remove this patch if unnecessary. - patches = lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://github.com/wxWidgets/wxWidgets/commit/1faf1796b23b2503296d9b1e9ad39047d633f8c9.patch"; - sha256 = "sha256-0FbfzGzzkriLD2iDcRcBXgYqjHtxFsmSlhGE5d18/bo="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix new file mode 100644 index 000000000000..3231fa2744c7 --- /dev/null +++ b/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/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index bf2825b5967e..4370a27012dc 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,69 +1,110 @@ -{ config -, stdenv -, lib -, fetchFromGitHub -, cmake -, gtest -, doCheck ? true -, cudaSupport ? config.cudaSupport or false -, ncclSupport ? false -, cudaPackages -, llvmPackages -}: +{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true +, cudaSupport ? config.cudaSupport or false, ncclSupport ? false +, rLibrary ? false, cudaPackages, llvmPackages, R, rPackages }: assert ncclSupport -> cudaSupport; +# Disable regular tests when building the R package +# because 1) the R package runs its own tests and +# 2) the R package creates a different binary shared +# object that isn't compatible with the regular CLI +# tests. +assert rLibrary -> doCheck != true; stdenv.mkDerivation rec { - pname = "xgboost"; + pnameBase = "xgboost"; + # prefix with r when building the R library + # The R package build results in a special xgboost.so file + # that contains a subset of the .so file use for the CLI + # and python version. In general, the CRAN version from + # nixpkgs's r-modules should be used, but this non-standard + # build allows for enabling CUDA and NCCL support which aren't + # included in the CRAN release. Build with: + # nix-build -E "with (import $NIXPKGS{}); \ + # let \ + # xgb = xgboost.override{rLibrary = true; doCheck = false;}; \ + # in \ + # rWrapper.override{ packages = [ xgb ]; }" + pname = lib.optionalString rLibrary "r-" + pnameBase; version = "1.7.3"; src = fetchFromGitHub { owner = "dmlc"; - repo = pname; + repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; }; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages.openmp - ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook - ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ] + ++ lib.optionals rLibrary [ R ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optional ncclSupport cudaPackages.nccl; + ++ lib.optional ncclSupport cudaPackages.nccl; + + propagatedBuildInputs = lib.optionals rLibrary [ + rPackages.data_table + rPackages.jsonlite + rPackages.Matrix + ]; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] - ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] - ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; + ++ lib.optionals cudaSupport [ + "-DUSE_CUDA=ON" + "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" + ] ++ lib.optionals (cudaSupport + && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") + [ "-DBUILD_WITH_CUDA_CUB=ON" ] + ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] + ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; + + preConfigure = lib.optionals rLibrary '' + substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" + export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" + ''; inherit doCheck; # By default, cmake build will run ctests with all checks enabled # If we're building with cuda, we run ctest manually so that we can skip the GPU tests checkPhase = lib.optionalString cudaSupport '' - ctest --force-new-ctest-process ${lib.optionalString cudaSupport "-E TestXGBoostLib"} + ctest --force-new-ctest-process ${ + lib.optionalString cudaSupport "-E TestXGBoostLib" + } ''; - installPhase = let - libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' - runHook preInstall - mkdir -p $out - cp -r ../include $out - cp -r ../dmlc-core/include/dmlc $out/include - cp -r ../rabit/include/rabit $out/include - install -Dm755 ../lib/${libname} $out/lib/${libname} - install -Dm755 ../xgboost $out/bin/xgboost - runHook postInstall + installPhase = + let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' + runHook preInstall + mkdir -p $out + cp -r ../include $out + cp -r ../dmlc-core/include/dmlc $out/include + cp -r ../rabit/include/rabit $out/include + '' + lib.optionalString (!rLibrary) '' + install -Dm755 ../lib/${libname} $out/lib/${libname} + install -Dm755 ../xgboost $out/bin/xgboost + '' + # the R library option builds a completely different binary xgboost.so instead of + # libxgboost.so, which isn't full featured for python and CLI + + lib.optionalString rLibrary '' + mkdir $out/library + export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" + make install -l $out/library + '' + '' + runHook postInstall + ''; + + postFixup = lib.optionalString rLibrary '' + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + fi ''; meta = with lib; { - description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; + description = + "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index fc6fd501c4d8..15aecee196d0 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/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/pkgs/development/libraries/zint/qobject.patch b/pkgs/development/libraries/zint/qobject.patch deleted file mode 100644 index f991d52648f3..000000000000 --- a/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/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 52654b6541e3..4ca77d56fca9 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/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/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index aa04a8dce2e2..f65a55dae117 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -51,6 +51,9 @@ let nativeBuildInputs = [ pkgs.libdevil ]; nativeLibs = [ pkgs.libdevil ]; }; + cl-freeimage = pkg: { + nativeLibs = [ freeimage ]; + }; cl-freetype2 = pkg: { nativeLibs = [ freetype ]; nativeBuildInputs = [ freetype ]; @@ -144,6 +147,7 @@ let }; classimp = pkg: { nativeLibs = [ assimp ]; + meta.broken = true; # Requires assimp ≤ 5.0.x. }; clsql-postgresql = pkg: { nativeLibs = [ postgresql.lib ]; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index a7e9a69ff3ad..fd972aabceb6 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.202"; + version = "0.6.206"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H16CNJ8ztcwGDoH4dZ66/HbpNVEe+pYpKJcFpjW2wCs="; + sha256 = "sha256-9NyZaoZgHl0qyiJG2ZiarsXQy1o8fsbKGCpPBO/A1hY="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 75f393b3f9e2..d27c1bb1cdc9 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -186,7 +186,7 @@ rec { system-images = lib.flatten (map (apiVersion: map (type: map (abiVersion: - if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then + lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) ( deployAndroidPackage { inherit os; package = system-images-packages.${apiVersion}.${type}.${abiVersion}; @@ -197,7 +197,7 @@ rec { sed -i '/^Addon.Vendor/d' source.properties ''; } - else [] + ) ) abiVersions ) systemImageTypes ) platformVersions); @@ -217,7 +217,7 @@ rec { }; # All NDK bundles. - ndk-bundles = if includeNDK then map makeNdkBundle ndkVersions else []; + ndk-bundles = lib.optionals includeNDK (map makeNdkBundle ndkVersions); # The "default" NDK bundle. ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f57a5c08422b..cc99dfb2971c 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -49,7 +49,7 @@ deployAndroidPackage { done # Patch executables - if [ -d prebuild/linux-x86_64 ]; then + if [ -d prebuilt/linux-x86_64 ]; then autoPatchelf prebuilt/linux-x86_64 fi diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 0df241ad3787..0f89dbe934df 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.21.3"; + version = "1.23.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1sphkzknz4lidj3vxzvq31x6k6si32smn2yylibccv4p4hjwvn68"; + sha256 = "0g508x79vhn7phmk4vlr3c213k0vi6yk0mpfcz5jcg4mpdapfmri"; }; dontUnpack = true; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index e4c3062cf531..fa2eeae00b55 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation ({ echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products '' else if target == "iphone" then - if release then '' + lib.optionalString release '' mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products @@ -180,7 +180,6 @@ stdenv.mkDerivation ({ echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} '' - else "" else throw "Target: ${target} is not supported!"} ''; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 4c8a63a0a528..a42a9c20923d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -103,10 +103,9 @@ stdenv.mkDerivation { '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.system == "x86_64-linux" then - '' + else lib.optionalString (stdenv.system == "x86_64-linux") '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' - else ""} + } ''; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index e51775b8c6df..a0907881d168 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -105,10 +105,9 @@ stdenv.mkDerivation { '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.system == "x86_64-linux" then - '' + else lib.optionalString (stdenv.system == "x86_64-linux") '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' - else ""} + } ''; } diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 4bef0ba2db0e..6120025d5e3e 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} ${lib.optionalString release '' ${lib.optionalString generateIPA '' diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 5869a0e1726a..c4213f0b8c83 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/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/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6b11be178ff8..c243f3074082 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/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/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 1ecf716329b9..1a1049044355 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -268,11 +268,7 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postFixup = '' wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} - ${ - if stdenv.isLinux - then "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" - else "" - } + ${lib.optionalString stdenv.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} ''; }; diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index 006316295e49..5fa482acc6d4 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { version = "0.11.2"; minimalOCamlVersion = "4.11"; + duneVersion = "3"; src = fetchFromGitHub { owner = "biocaml"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 822c002a8de3..d6c230d9dbde 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/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/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index b39cb471e4cb..0de51fbb5787 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; - version = "1.3.1"; + version = "1.3.2"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04.1"; + minimalOCamlVersion = "4.04.1"; src = fetchFromGitHub { owner = "biocaml"; repo = pname; rev = version; - sha256 = "0qnxfp6y294gjsccx7ksvwn9x5q20hi8sg24rjypzsdkmlphgdnd"; + hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; patches = [ ./git_commit.patch ]; @@ -21,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; - propagatedBuildInputs = [ core_kernel ]; + propagatedBuildInputs = [ camlp-streams core_kernel ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 0b14aa57c749..498dcdfe04cb 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/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 ]; diff --git a/pkgs/development/ocaml-modules/chrome-trace/default.nix b/pkgs/development/ocaml-modules/chrome-trace/default.nix index fb6c14b3362e..9c427d343758 100644 --- a/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/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/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 59bd81544945..61a0d6021ab6 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "irmin-chunk"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix index 73cd25f3170d..aa003f39b3f4 100644 --- a/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/pkgs/development/ocaml-modules/irmin/containers.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "irmin-containers"; inherit (ppx_irmin) src version strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 66b572f576d6..485547ddcad6 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/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 diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 1788cf1eda23..4b8d7c4b97aa 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "irmin-fs"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin astring logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/mirage.nix b/pkgs/development/ocaml-modules/irmin/mirage.nix index 9e4bd9330799..2d7d0a891249 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/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/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index a1a2974a4d74..8c0c7b2a3b00 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/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,7 +13,7 @@ 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 ]; checkInputs = [ astring alcotest alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 83cd5b1d7f5f..4ff7f4a8bdd8 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,14 +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"; + duneVersion = "3"; propagatedBuildInputs = [ ppx_repr diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index 942200bf429a..4e2ccce71663 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/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 ]; diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 82a89daec359..ddfc0d073205 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "irmin-tezos"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix new file mode 100644 index 000000000000..39952366dbac --- /dev/null +++ b/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/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix new file mode 100644 index 000000000000..751f4e14a2d3 --- /dev/null +++ b/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/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix index 49a00747cfa6..e03e17905faa 100644 --- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -20,6 +20,8 @@ buildDunePackage { meta ; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix index ce859d366b03..8b0dbec39276 100644 --- a/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -19,13 +19,14 @@ buildDunePackage rec { pname = "netchannel"; - version = "2.1.1"; + version = "2.1.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz"; - sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs="; + hash = "sha256-lTmwcNKiaq5EdJdM4UaaAVdZ+hTCX5U9MPKY/r3i7fw="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 9375029f5f68..f604780f4769 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "npy"; version = "0.0.9"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "${pname}-ocaml"; rev = version; - sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; + hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; }; propagatedBuildInputs = [ camlzip ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 3111d4277c41..1c7d72cbc36d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -26,7 +26,7 @@ buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2"; - minimumOCamlVersion = + minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" else @@ -74,7 +74,6 @@ buildDunePackage rec { [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ - cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius @@ -83,6 +82,8 @@ buildDunePackage rec { cmdliner ]; + nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; + propagatedBuildInputs = [ csexp jsonrpc diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index c3bffc013f95..8613ccf9ae08 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/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/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 7872edca5922..3b75428d0efb 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/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/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 189359cd1c86..32eef1193650 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "owl-base"; version = "1.0.2"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; - sha256 = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM="; + hash = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM="; }; - minimumOCamlVersion = "4.10"; + minimalOCamlVersion = "4.10"; meta = with lib; { description = "Numerical computing library for Ocaml"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 6e77b6312fa4..ac294648d217 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -14,7 +14,9 @@ buildDunePackage rec { pname = "owl"; - inherit (owl-base) version src meta useDune2; + inherit (owl-base) version src meta; + + duneVersion = "3"; checkInputs = [ alcotest ]; buildInputs = [ dune-configurator stdio ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index e67429a6a45f..d41e7c16ce1b 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -26,6 +26,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; nativeCheckInputs = [ bppsuite ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index b7d1986c30d4..acc36f2b01ac 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -3,9 +3,10 @@ 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 ]; diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix index 3675b8994264..492e01ce5d59 100644 --- a/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/pkgs/development/ocaml-modules/rosetta/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij"; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ coin diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index 73d899eafa93..9dd895ea4b0e 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/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 ]; checkInputs = [ alcotest ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix index 1f97d7ff52d2..eacdcf303c2d 100644 --- a/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -9,7 +9,8 @@ buildDunePackage { pname = "rpclib-lwt"; - inherit (rpclib) version useDune2 src; + inherit (rpclib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt rpclib ]; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 3184e460a9ac..0c1081159ede 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/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/pkgs/development/ocaml-modules/rusage/default.nix b/pkgs/development/ocaml-modules/rusage/default.nix new file mode 100644 index 000000000000..891784ba6def --- /dev/null +++ b/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/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix new file mode 100644 index 000000000000..f66abd2bdcf1 --- /dev/null +++ b/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/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index f20a6cff0a89..cfd03493d3af 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/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/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index dddbf8a790d5..e46374ee1c27 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -17,15 +17,16 @@ buildDunePackage rec { pname = "torch"; - version = "0.15"; + version = "0.17"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "sha256-EXJqlAGa0LwQKY8IlmcoJs0l2eRTiUhuzMHfakrslXU="; + hash = "sha256-z/9NUBjeFWE63Z/e8OyzDiy8hrn6qzjaiBH8G9MPeos="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index 4473cd8217c0..ed38329ae22b 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -25,9 +25,11 @@ buildDunePackage rec { buildInputs = [ angstrom ]; - 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/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index 8d3810fa7e9e..52543175e07c 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/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/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 2fc4b3c3b430..8005322cff73 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/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/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index b2d319d7f404..c7c2d9fc323e 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,11 +1,11 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: -mkDerivation rec { +mkDerivation (finalAttrs: { pname = "grumphp"; version = "1.15.0"; src = fetchurl { - url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + url = "https://github.com/phpro/grumphp/releases/download/v${finalAttrs.version}/grumphp.phar"; sha256 = "sha256-EqzJb7DYZb7PnebErLVI/EZLxj0m26cniZlsu1feif0="; }; @@ -16,17 +16,17 @@ mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin - install -D $src $out/libexec/${pname}/grumphp.phar + install -D $src $out/libexec/grumphp/grumphp.phar makeWrapper ${php}/bin/php $out/bin/grumphp \ - --add-flags "$out/libexec/${pname}/grumphp.phar" + --add-flags "$out/libexec/grumphp/grumphp.phar" runHook postInstall ''; meta = with lib; { - changelog = "https://github.com/phpro/grumphp/releases/tag/v${version}"; + changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; license = licenses.mit; maintainers = teams.php.members; }; -} +}) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 00aef53cc1b2..5366fb078678 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.32"; + version = "0.29.33"; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-hzPPR1i3kwTypOOev6xekjQbzke8zrJsElQ5iy+MGvc="; + hash = "sha256-UEB2TEpNLOlko5XaJPDRrlgUSZXauSxrlvRMP01yKGo="; }; nativeBuildInputs = [ @@ -46,11 +46,7 @@ in buildPythonPackage rec { # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. # it does not affect Python code unless the code explicitly uses the feature. # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) - (fetchpatch { - name = "trashcan.patch"; - url = "https://github.com/cython/cython/commit/f781880b6780117660b2026caadf4a6d7905722f.patch"; - sha256 = "sha256-SnjaJdBZxm3O5gJ5Dxut6+eeVtZv+ygUUNwAwgoiFxg="; - }) + ./trashcan.patch # The above commit introduces custom trashcan macros, as well as # compiler changes to use them in Cython-emitted code. The latter # change is still useful, but the former has been upstreamed as of @@ -79,6 +75,7 @@ in buildPythonPackage rec { # doCheck = !stdenv.isDarwin; meta = { + changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/Cython/trashcan.patch b/pkgs/development/python-modules/Cython/trashcan.patch new file mode 100644 index 000000000000..398422e76f39 --- /dev/null +++ b/pkgs/development/python-modules/Cython/trashcan.patch @@ -0,0 +1,354 @@ +From 1b77e35d848340f2c5f4c9b82965c25a0572d48f Mon Sep 17 00:00:00 2001 +From: Jeroen Demeyer +Date: Thu, 14 Feb 2019 10:02:41 +0100 +Subject: [PATCH] @cython.trashcan directive to enable the Python trashcan for + deallocations + +--- + Cython/Compiler/ModuleNode.py | 10 +++ + Cython/Compiler/Options.py | 2 + + Cython/Compiler/PyrexTypes.py | 8 +- + Cython/Compiler/Symtab.py | 18 +++- + Cython/Utility/ExtensionTypes.c | 43 ++++++++++ + tests/run/trashcan.pyx | 148 ++++++++++++++++++++++++++++++++ + 6 files changed, 227 insertions(+), 2 deletions(-) + create mode 100644 tests/run/trashcan.pyx + +diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py +index 56845330d..3a3e8a956 100644 +--- a/Cython/Compiler/ModuleNode.py ++++ b/Cython/Compiler/ModuleNode.py +@@ -1443,6 +1443,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + + is_final_type = scope.parent_type.is_final_type + needs_gc = scope.needs_gc() ++ needs_trashcan = scope.needs_trashcan() + + weakref_slot = scope.lookup_here("__weakref__") if not scope.is_closure_class_scope else None + if weakref_slot not in scope.var_entries: +@@ -1481,6 +1482,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + # running this destructor. + code.putln("PyObject_GC_UnTrack(o);") + ++ if needs_trashcan: ++ code.globalstate.use_utility_code( ++ UtilityCode.load_cached("PyTrashcan", "ExtensionTypes.c")) ++ code.putln("__Pyx_TRASHCAN_BEGIN(o, %s)" % slot_func_cname) ++ + # call the user's __dealloc__ + self.generate_usr_dealloc_call(scope, code) + +@@ -1554,6 +1560,10 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + code.putln("(*Py_TYPE(o)->tp_free)(o);") + if freelist_size: + code.putln("}") ++ ++ if needs_trashcan: ++ code.putln("__Pyx_TRASHCAN_END") ++ + code.putln( + "}") + +diff --git a/Cython/Compiler/Options.py b/Cython/Compiler/Options.py +index d03119fca..05a728135 100644 +--- a/Cython/Compiler/Options.py ++++ b/Cython/Compiler/Options.py +@@ -319,6 +319,7 @@ directive_types = { + 'freelist': int, + 'c_string_type': one_of('bytes', 'bytearray', 'str', 'unicode'), + 'c_string_encoding': normalise_encoding_name, ++ 'trashcan': bool, + 'cpow': bool + } + +@@ -362,6 +363,7 @@ directive_scopes = { # defaults to available everywhere + 'np_pythran': ('module',), + 'fast_gil': ('module',), + 'iterable_coroutine': ('module', 'function'), ++ 'trashcan' : ('cclass',), + } + + +diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py +index c309bd04b..9231130b5 100644 +--- a/Cython/Compiler/PyrexTypes.py ++++ b/Cython/Compiler/PyrexTypes.py +@@ -1129,6 +1129,7 @@ class PyObjectType(PyrexType): + is_extern = False + is_subclassed = False + is_gc_simple = False ++ builtin_trashcan = False # builtin type using trashcan + + def __str__(self): + return "Python object" +@@ -1183,10 +1184,14 @@ class PyObjectType(PyrexType): + + + builtin_types_that_cannot_create_refcycles = set([ +- 'bool', 'int', 'long', 'float', 'complex', ++ 'object', 'bool', 'int', 'long', 'float', 'complex', + 'bytearray', 'bytes', 'unicode', 'str', 'basestring' + ]) + ++builtin_types_with_trashcan = set([ ++ 'dict', 'list', 'set', 'frozenset', 'tuple', 'type', ++]) ++ + + class BuiltinObjectType(PyObjectType): + # objstruct_cname string Name of PyObject struct +@@ -1211,6 +1216,7 @@ class BuiltinObjectType(PyObjectType): + self.typeptr_cname = "(&%s)" % cname + self.objstruct_cname = objstruct_cname + self.is_gc_simple = name in builtin_types_that_cannot_create_refcycles ++ self.builtin_trashcan = name in builtin_types_with_trashcan + if name == 'type': + # Special case the type type, as many C API calls (and other + # libraries) actually expect a PyTypeObject* for type arguments. +diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py +index 7361a55ae..f0c311ba6 100644 +--- a/Cython/Compiler/Symtab.py ++++ b/Cython/Compiler/Symtab.py +@@ -2043,7 +2043,7 @@ class PyClassScope(ClassScope): + class CClassScope(ClassScope): + # Namespace of an extension type. + # +- # parent_type CClassType ++ # parent_type PyExtensionType + # #typeobj_cname string or None + # #objstruct_cname string + # method_table_cname string +@@ -2087,6 +2087,22 @@ class CClassScope(ClassScope): + return not self.parent_type.is_gc_simple + return False + ++ def needs_trashcan(self): ++ # If the trashcan directive is explicitly set to False, ++ # unconditionally disable the trashcan. ++ directive = self.directives.get('trashcan') ++ if directive is False: ++ return False ++ # If the directive is set to True and the class has Python-valued ++ # C attributes, then it should use the trashcan in tp_dealloc. ++ if directive and self.has_cyclic_pyobject_attrs: ++ return True ++ # Use the trashcan if the base class uses it ++ base_type = self.parent_type.base_type ++ if base_type and base_type.scope is not None: ++ return base_type.scope.needs_trashcan() ++ return self.parent_type.builtin_trashcan ++ + def needs_tp_clear(self): + """ + Do we need to generate an implementation for the tp_clear slot? Can +diff --git a/Cython/Utility/ExtensionTypes.c b/Cython/Utility/ExtensionTypes.c +index dc187ab49..f359165df 100644 +--- a/Cython/Utility/ExtensionTypes.c ++++ b/Cython/Utility/ExtensionTypes.c +@@ -119,6 +119,49 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) { + return r; + } + ++/////////////// PyTrashcan.proto /////////////// ++ ++// These macros are taken from https://github.com/python/cpython/pull/11841 ++// Unlike the Py_TRASHCAN_SAFE_BEGIN/Py_TRASHCAN_SAFE_END macros, they ++// allow dealing correctly with subclasses. ++ ++// This requires CPython version >= 2.7.4 ++// (or >= 3.2.4 but we don't support such old Python 3 versions anyway) ++#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x02070400 ++#define __Pyx_TRASHCAN_BEGIN_CONDITION(op, cond) \ ++ do { \ ++ PyThreadState *_tstate = NULL; \ ++ // If "cond" is false, then _tstate remains NULL and the deallocator ++ // is run normally without involving the trashcan ++ if (cond) { \ ++ _tstate = PyThreadState_GET(); \ ++ if (_tstate->trash_delete_nesting >= PyTrash_UNWIND_LEVEL) { \ ++ // Store the object (to be deallocated later) and jump past ++ // Py_TRASHCAN_END, skipping the body of the deallocator ++ _PyTrash_thread_deposit_object((PyObject*)(op)); \ ++ break; \ ++ } \ ++ ++_tstate->trash_delete_nesting; \ ++ } ++ // The body of the deallocator is here. ++#define __Pyx_TRASHCAN_END \ ++ if (_tstate) { \ ++ --_tstate->trash_delete_nesting; \ ++ if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \ ++ _PyTrash_thread_destroy_chain(); \ ++ } \ ++ } while (0); ++ ++#define __Pyx_TRASHCAN_BEGIN(op, dealloc) __Pyx_TRASHCAN_BEGIN_CONDITION(op, \ ++ Py_TYPE(op)->tp_dealloc == (destructor)(dealloc)) ++ ++#else ++// The trashcan is a no-op on other Python implementations ++// or old CPython versions ++#define __Pyx_TRASHCAN_BEGIN(op, dealloc) ++#define __Pyx_TRASHCAN_END ++#endif ++ + /////////////// CallNextTpDealloc.proto /////////////// + + static void __Pyx_call_next_tp_dealloc(PyObject* obj, destructor current_tp_dealloc); +diff --git a/tests/run/trashcan.pyx b/tests/run/trashcan.pyx +new file mode 100644 +index 000000000..93a501ff8 +--- /dev/null ++++ b/tests/run/trashcan.pyx +@@ -0,0 +1,148 @@ ++# mode: run ++ ++cimport cython ++ ++ ++# Count number of times an object was deallocated twice. This should remain 0. ++cdef int double_deallocations = 0 ++def assert_no_double_deallocations(): ++ global double_deallocations ++ err = double_deallocations ++ double_deallocations = 0 ++ assert not err ++ ++ ++# Compute x = f(f(f(...(None)...))) nested n times and throw away the result. ++# The real test happens when exiting this function: then a big recursive ++# deallocation of x happens. We are testing two things in the tests below: ++# that Python does not crash and that no double deallocation happens. ++# See also https://github.com/python/cpython/pull/11841 ++def recursion_test(f, int n=2**20): ++ x = None ++ cdef int i ++ for i in range(n): ++ x = f(x) ++ ++ ++@cython.trashcan(True) ++cdef class Recurse: ++ """ ++ >>> recursion_test(Recurse) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef public attr ++ cdef int deallocated ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.deallocated ++ self.deallocated = 1 ++ ++ ++cdef class RecurseSub(Recurse): ++ """ ++ >>> recursion_test(RecurseSub) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef int subdeallocated ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.subdeallocated ++ self.subdeallocated = 1 ++ ++ ++@cython.freelist(4) ++@cython.trashcan(True) ++cdef class RecurseFreelist: ++ """ ++ >>> recursion_test(RecurseFreelist) ++ >>> recursion_test(RecurseFreelist, 1000) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef public attr ++ cdef int deallocated ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.deallocated ++ self.deallocated = 1 ++ ++ ++# Subclass of list => uses trashcan by default ++# As long as https://github.com/python/cpython/pull/11841 is not fixed, ++# this does lead to double deallocations, so we skip that check. ++cdef class RecurseList(list): ++ """ ++ >>> RecurseList(42) ++ [42] ++ >>> recursion_test(RecurseList) ++ """ ++ def __init__(self, x): ++ super().__init__((x,)) ++ ++ ++# Some tests where the trashcan is NOT used. When the trashcan is not used ++# in a big recursive deallocation, the __dealloc__s of the base classs are ++# only run after the __dealloc__s of the subclasses. ++# We use this to detect trashcan usage. ++cdef int base_deallocated = 0 ++cdef int trashcan_used = 0 ++def assert_no_trashcan_used(): ++ global base_deallocated, trashcan_used ++ err = trashcan_used ++ trashcan_used = base_deallocated = 0 ++ assert not err ++ ++ ++cdef class Base: ++ def __dealloc__(self): ++ global base_deallocated ++ base_deallocated = 1 ++ ++ ++# Trashcan disabled by default ++cdef class Sub1(Base): ++ """ ++ >>> recursion_test(Sub1, 100) ++ >>> assert_no_trashcan_used() ++ """ ++ cdef public attr ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ global base_deallocated, trashcan_used ++ trashcan_used += base_deallocated ++ ++ ++@cython.trashcan(True) ++cdef class Middle(Base): ++ cdef public foo ++ ++ ++# Trashcan disabled explicitly ++@cython.trashcan(False) ++cdef class Sub2(Middle): ++ """ ++ >>> recursion_test(Sub2, 1000) ++ >>> assert_no_trashcan_used() ++ """ ++ cdef public attr ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ global base_deallocated, trashcan_used ++ trashcan_used += base_deallocated +-- +2.39.0 + diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index b1b13bf581d1..c3b32bbc5dee 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; - rev = version; - hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM="; + rev = "refs/tags/${version}"; + hash = "sha256-VkO+XLIC/UQzvfLsgbKcx9i8OxTC6J32nkxPHWWn7m8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to quickly gather forensic artifacts from disk images or a live system"; homepage = "https://github.com/fox-it/acquire"; + changelog = "https://github.com/fox-it/acquire/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix index d3712ba46c24..6d32b9530523 100644 --- a/pkgs/development/python-modules/adafruit-pureio/default.nix +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - pname = "Adafruit-PureIO"; - version = "1.1.9"; + pname = "adafruit-pureio"; + version = "1.1.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit_PureIO"; inherit version; - sha256 = "0yd8hw676s7plq75gac4z0ilfcfydjkk3wv76bc73xy70zxj5brc"; + hash = "sha256-EgaIN1PAlmMJ5tAtqXBnbpvHtQO7Sib3NuAXOfVqZLk="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; # Physical SMBus is not present doCheck = false; - pythonImportsCheck = [ "Adafruit_PureIO" ]; + + pythonImportsCheck = [ + "Adafruit_PureIO" + ]; meta = with lib; { description = "Python interface to Linux IO including I2C and SPI"; homepage = "https://github.com/adafruit/Adafruit_Python_PureIO"; + changelog = "https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index cb9db9a886fa..63a9987994c9 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/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 = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parser for JET databases"; homepage = "https://github.com/skelsec/aesedb"; + changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 2e878b014cc2..fa0611385b01 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.36"; + version = "9.2.38"; 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-nhvFBXOoxCWaSjUdPyQP234URI50DM3ZoweRK9d1LIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 9a302f5af088..56e5f8475cbc 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , aio-geojson-client , fetchFromGitHub @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 728a666447d3..1cb112583935 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -32,12 +31,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - aresponses - asynctest - pytest-asyncio pytestCheckHook ]; + checkInputs = [ + aresponses + pytest-asyncio + ]; + pythonImportsCheck = [ "aio_geojson_usgs_earthquakes" ]; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 550c6d675e99..42f8f3fb7bf3 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.55"; + version = "0.1.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-Lyhv6JF+KuCiGz05EbXMEeXzVCI7ACsJmnEuAtDghYo="; + hash = "sha256-YLAIT33ItaNgokwensOan/OO2lK01GO/u5AZwzvuoPo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 4d5c652db9be..b7fbf9af5dd2 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , poetry-core @@ -19,19 +18,19 @@ buildPythonPackage rec { version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; + rev = "refs/tags/${version}"; + hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; }; postPatch = '' # https://github.com/bachya/aioambient/pull/97 substituteInPlace pyproject.toml \ - --replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"' + --replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"' ''; nativeBuildInputs = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook @@ -65,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Ambient Weather API"; homepage = "https://github.com/bachya/aioambient"; + changelog = "https://github.com/bachya/aioambient/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54979dbd7ba4..105ebc9188ea 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -3,31 +3,43 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, pythonOlder }: buildPythonPackage rec { pname = "aiocache"; - version = "0.11.1"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + rev = "refs/tags/v${version}"; + hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; - propagatedBuildInputs = [ - aioredis - msgpack - ]; + passthru.optional-dependencies = { + redis = [ + aioredis + ]; + msgpack = [ + msgpack + ]; + }; # aiomcache would be required but last release was in 2017 doCheck = false; - pythonImportsCheck = [ "aiocache" ]; + + pythonImportsCheck = [ + "aiocache" + ]; meta = with lib; { description = "Python API Rate Limit Decorator"; - homepage = "https://github.com/tomasbasham/ratelimit"; + homepage = "https://github.com/aio-libs/aiocache"; + changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 23fab5398d63..b5d93fae31b2 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/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/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix new file mode 100644 index 000000000000..b6cc55d7fd84 --- /dev/null +++ b/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/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 82cdb3733bb5..c0d21eec563a 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.1.0"; + version = "13.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU="; + hash = "sha256-Pca+SMuUL3XyQpLAL6SOYPnztc95WF2o0v4+5Nc5Nxg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index a2c4eaf5ff8e..5d79aaa1bc32 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/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/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index fcbe12a11db7..83f623162962 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -2,7 +2,6 @@ , aiohttp , async-timeout , asyncio-dgram -, asynctest , buildPythonPackage , docutils , fetchFromGitHub @@ -10,22 +9,24 @@ , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder , voluptuous }: buildPythonPackage rec { pname = "aioguardian"; version = "2022.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; + hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; }; - format = "pyproject"; - nativeBuildInputs = [ poetry-core ]; @@ -40,17 +41,11 @@ buildPythonPackage rec { nativeCheckInputs = [ asyncio-dgram - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = "<0.18"' 'docutils = "*"' - ''; - disabledTestPaths = [ "examples/" ]; @@ -62,10 +57,11 @@ buildPythonPackage rec { meta = with lib; { description = " Python library to interact with Elexa Guardian devices"; longDescription = '' - aioguardian is a Pytho3, asyncio-focused library for interacting with the + aioguardian is an asyncio-focused library for interacting with the Guardian line of water valves and sensors from Elexa. ''; homepage = "https://github.com/bachya/aioguardian"; + changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index e29f22ba3c99..e9b27ea7a83e 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/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/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 8e062db87e6d..6008b94179fb 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.5"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fDul6sBgtpH05QU0ry15/KKnVxLr0rJeb8sSlYWfkQs="; + hash = "sha256-jRSbKlfZH3lLM6OU6lvGa1Z/OMdKWmqUd6/CRQ8QXAE="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 6cae53c1bce8..4c5ea7191940 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.7"; + version = "0.8.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pqneX4O3BnDH7vT7RgFiEIMpLcoXOpBvKOYuMla3Iq4="; + hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index b3a65926d6e8..ce000ddb0361 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "16.2.10"; + version = "16.3.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iQlbd1DoPgxq+Am0BTDYXIBZoC21/54+bywDtcCXlls="; + hash = "sha256-lHDjsK8ds1ftovY2IAbJwk3jnn4FoDo6f/Nu/MSAhqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index d89ada4a67e3..cfb41c7c1fdf 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -3,19 +3,21 @@ , fetchFromGitHub , aiohttp , prettytable +, pythonOlder }: buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.6"; - + version = "0.0.8"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-3p38gWCqQVYz3sgu6SgfPH+wH/ZH2Qg+tVXiARuUh7s="; + hash = "sha256-SwNHLDizkpOP+zSDzn84J2l8ltZi/ponnptzuVJMHUA="; }; propagatedBuildInputs = [ @@ -32,6 +34,7 @@ buildPythonPackage rec { meta = { description = "AsyicIO client for US models of Honeywell Thermostats"; homepage = "https://github.com/mkmer/AIOSomecomfort"; + changelog = "https://github.com/mkmer/AIOSomecomfort/releases/tag/${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 0bd275f294ab..9fb42cd93e10 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/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/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 59a2483d02ee..54c0f9132ef6 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -1,20 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, prompt-toolkit , pythonOlder , winacl -, prompt-toolkit }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.7"; + version = "0.0.9"; + format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1p88q2b6slm1sw3234r40s9jd03fqlkcx8y3iwg6ihf0z4ww14d1"; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-FyrYqNqp0PTEHHit3Rn00jtvPOvgVy+lz3jDRJnsobI="; }; propagatedBuildInputs = [ @@ -25,11 +28,14 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ "aiowinreg" ]; + pythonImportsCheck = [ + "aiowinreg" + ]; meta = with lib; { description = "Python module to parse the registry hive"; homepage = "https://github.com/skelsec/aiowinreg"; + changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 6351fea9bd80..eda8e77e43b7 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Airthings BLE devices"; homepage = "https://github.com/vincegio/airthings-ble"; + changelog = "https://github.com/vincegio/airthings-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 6d0a9d5eb2a4..ddbd7f1e2891 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bcAaFwAS9xAbCLtqYtSiALHtlGklHFgGXpgiZZpR6no="; + hash = "sha256-pNWqow396BB5cC1dOhDelykjqeWFN+IKosKEDu5nB1o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 6a5802c388f9..06c56116de4e 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.49.0"; + version = "8.50.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; + hash = "sha256-tFI6iPvKWp69PKvkBrMQrkMZD03VHhLIIDy0VI5XLEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 4abcad0e7c9b..8c80631bc1a9 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.36"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-KVIrhzd3EoDIVImshfjZrBAiNkCtlFAd6Ox9ATsvPTY="; + hash = "sha256-9/7GiF+Q7AUmKEqleVF8brCFSAqswalXxgPCApD19ZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index d05d730a467a..96f381f56d03 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.4.8"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "refs/tags/v${version}"; - hash = "sha256-A4SqDEArnRG9SJTqU/C9TOQO2vjot+hfj2/PKB/JMfw="; + hash = "sha256-xUg7+7oWxIVdKLOGIE1uxh7SSjkz/w0//OyMF1HhEJk="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 12c353d1059f..cc971f43215f 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.11.0"; + version = "6.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; + hash = "sha256-4tRdgxVyn0Kcu+/atEbTgFCtezbZ46oewb6vKRTQKaA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 08d69424e579..e204d816dc0d 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/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/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 066af243f627..e4e1f5873b21 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "8.1.0"; + version = "8.2.0"; pname = "approvaltests"; format = "setuptools"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA="; + hash = "sha256-7OeFOPBOs+SXKOQGKxiigVvoY50+bqRo+oDbVYTMQxU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 894a30c7c606..7710d856fb8a 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/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/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index c44126537794..7cba156bd684 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.1.0"; + version = "1.2.1"; 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-nRInKju3Q4En+SiSl6DOeeTRK56TzKPweoVXsvzs45I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 22a460cc2741..87d33b235c2b 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.36"; + version = "9.2.38"; 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-fpYoX5+TrZaozq7E3qBlhYUPrbbL3fb+wadQToLqtU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index bdc2a078a8a5..55da36c71c6f 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -9,22 +9,13 @@ buildPythonPackage rec { pname = "argh"; - version = "0.26.2"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"; + hash = "sha256-AMkCf29GG88kr+WZooG72ly9Xe5LZwW+++opOkyn0iE="; }; - 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/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix new file mode 100644 index 000000000000..e2c929b25147 --- /dev/null +++ b/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/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 5f27e8c131b5..6be8a76dece2 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-+lktPFCL2c79dNGgbsaFJRELmV6sJ2kiBSb8kd9XPIQ="; + hash = "sha256-aYWojS+SeAnFvSqyb9ceyRKhG1Hpn6/eK9xrXxQbVeA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index b0d2b1f72386..686a9e92cebf 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, dateparser , fetchFromGitHub +, pythonOlder +, requests +, shapely +, python-dateutil +, pytz , importlib-metadata , numpy +, dateparser +, jinja2 +, remotezip , pytestCheckHook -, python-dateutil -, pythonOlder -, pytz -, requests , requests-mock -, shapely -, wktutils +, defusedxml }: buildPythonPackage rec { @@ -29,25 +31,25 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateparser - importlib-metadata - numpy - python-dateutil - pytz requests shapely - wktutils + python-dateutil + pytz + importlib-metadata + numpy + dateparser + jinja2 + remotezip ]; nativeCheckInputs = [ pytestCheckHook - requests-mock ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "WKTUtils==" "WKTUtils>=" - ''; + checkInputs = [ + requests-mock + defusedxml + ]; pythonImportsCheck = [ "asf_search" diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index ed434bcb6bc7..4bfd53c08561 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.28"; + version = "0.9.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "newville"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk="; + hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 2eb0e4986f00..02f1a951d17c 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , numpy @@ -36,6 +37,8 @@ buildPythonPackage rec { hypothesis ]; + disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) "test_interpolate_bilinear_skycoord"; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 7eab56d09bba..ab74cf9666c1 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.12"; + version = "0.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ctTuabTfLhYJL/yv0k6oXP7JV0+qRFA0SARI3XopTeM="; + hash = "sha256-tVvqzKsCvvSgKB3xRBMnIQLEDzCaPO/h8cM8WMpzi6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index baf4702126f9..f999cd3b3b34 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -17,20 +17,25 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsbronder"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; + rev = "refs/tagsv${version}"; + hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; nativeCheckInputs = [ - pytest-asyncio pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + ]; + # OSError: AF_UNIX path too long doCheck = !stdenv.isDarwin; disabledTests = [ "test_protocol_pause_resume" + # TypeError: socket type must be 2 + "test_from_socket_bad_socket" ]; pythonImportsCheck = [ @@ -40,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python support for higher level Datagram"; homepage = "https://github.com/jsbronder/asyncio-dgram"; + changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 7e3129b726c1..c5888f000ee0 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.6"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-UWwqQ0ZYGoOsgRC7ROV9DDBQ/l/vXWB6uHpQ/WaFRAw="; + sha256 = "sha256-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix index 947f5db4b317..187aaeeb99ac 100644 --- a/pkgs/development/python-modules/atc-ble/default.nix +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -19,10 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -37,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "atc_ble" ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for ATC devices with custom firmware"; homepage = "https://github.com/Bluetooth-Devices/atc-ble"; + changelog = "https://github.com/Bluetooth-Devices/atc-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 954e3df9637d..2c85cbfcf79c 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.16.8"; + version = "0.16.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE="; + hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix new file mode 100644 index 000000000000..f1b937f3ecdc --- /dev/null +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -0,0 +1,88 @@ +{ backoff +, sparqlwrapper +, boto3 +, buildPythonPackage +, fetchFromGitHub +, gremlinpython +, jsonpath-ng +, lib +, moto +, openpyxl +, opensearch-py +, pandas +, pg8000 +, poetry-core +, progressbar2 +, pyarrow +, pymysql +, pyodbc +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, redshift-connector +, requests-aws4auth +}: + +buildPythonPackage rec { + pname = "awswrangler"; + version = "2.19.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7.1"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-sdk-pandas"; + rev = "refs/tags/${version}"; + hash = "sha256-xUEytEgr/djfnoOowLxAZmbPkMS+vU0fuPY7JxZXEe0="; + }; + + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; + + propagatedBuildInputs = [ + backoff + boto3 + gremlinpython + jsonpath-ng + openpyxl + opensearch-py + pandas + pg8000 + progressbar2 + pyarrow + pymysql + redshift-connector + requests-aws4auth + ]; + + pythonRelaxDeps = [ + "gremlinpython" + "numpy" + "pandas" + "pg8000" + ]; + + nativeCheckInputs = [ moto pytestCheckHook ]; + + pytestFlagsArray = [ + # Subset of tests that run in upstream CI (many others require credentials) + # https://github.com/aws/aws-sdk-pandas/blob/2b7c62ac0762b1303149bb3c03979791479ba4f9/.github/workflows/minimal-tests.yml + "tests/test_metadata.py" + "tests/test_session.py" + "tests/test_utils.py" + "tests/test_moto.py" + ]; + + passthru.optional-dependencies = { + sqlserver = [ pyodbc ]; + sparql = [ sparqlwrapper ]; + }; + + meta = { + description = "Pandas on AWS"; + homepage = "https://github.com/aws/aws-sdk-pandas"; + changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index ee7f9fd44ff4..e44dd89291b0 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07"; + sha256 = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 68a0409d9ead..4fca1b356a31 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/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/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 1d8ce8d5675a..351a870750d3 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.1"; + version = "12.4.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko="; + sha256 = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 45a57d1c68a0..1f4568f3b7f3 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/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/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 9c7a57adc08d..95f1a127db72 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/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/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix deleted file mode 100644 index af6652733bd5..000000000000 --- a/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/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index c5188188c467..4dac7ecf5b83 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/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/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix new file mode 100644 index 000000000000..2999eadd678f --- /dev/null +++ b/pkgs/development/python-modules/bambi/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, arviz +, blackjax +, formulae +, graphviz +, numpy +, numpyro +, 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 = [ + blackjax + graphviz + numpyro + pytestCheckHook + ]; + disabledTests = [ + # attempt to fetch data: + "test_data_is_copied" + "test_predict_offset" + ]; + + 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/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix deleted file mode 100644 index 454a972f177b..000000000000 --- a/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/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 6ac6521530ac..4d16dcebfd4b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/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/pkgs/development/python-modules/bencode-py/default.nix b/pkgs/development/python-modules/bencode-py/default.nix new file mode 100644 index 000000000000..e4d5041e8b4b --- /dev/null +++ b/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/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index c22c0c9657f1..84bd82d94ab2 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.9"; + version = "1.10.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA="; + sha256 = "sha256-WJb9EENkYFVgKuByHFJhed/Slt6ayG31LeQk1+14/Ys="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 91d663c6a23c..d756865be266 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/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/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index a9bbef0e4325..951bbaaab176 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.1"; + version = "2.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; + hash = "sha256-fqQhIBYrwImhacWAOc4vAZi12btsrHwHbDA1F2M1gRw="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix index 9d5ba8eaa8a9..82994b9d0d1d 100644 --- a/pkgs/development/python-modules/bite-parser/default.nix +++ b/pkgs/development/python-modules/bite-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bite-parser"; - version = "0.2.1"; + version = "0.2.2"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bite_parser"; inherit version; - hash = "sha256-PmZCCQzxCfCq6Mr1qn03tj/7/0we9Bfk5fj4K+wMhsk="; + hash = "sha256-mBghKgrNv4ZaRNowo7csWekmqrI0xAVKJKowSeumr4g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix new file mode 100644 index 000000000000..62fdc0e94a98 --- /dev/null +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, fastprogress +, jax +, jaxlib +, jaxopt +, optax +, typing-extensions +}: + +buildPythonPackage rec { + pname = "blackjax"; + version = "0.9.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "blackjax-devs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-EieDu9SJxi2cp1bHlxX4vvFZeDGMGIm24GoR8nSyjvE="; + }; + + patches = [ + # remove in next release + (fetchpatch { + name = "fix-lbfgs-args"; + url = "https://github.com/blackjax-devs/blackjax/commit/1aaa6f64bbcb0557b658604b2daba826e260cbc6.patch"; + hash = "sha256-XyjorXPH5Ap35Tv1/lTeTWamjplJF29SsvOq59ypftE="; + }) + ]; + + propagatedBuildInputs = [ + fastprogress + jax + jaxlib + jaxopt + optax + typing-extensions + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ "tests/test_benchmarks.py" ]; + disabledTests = [ + # too slow + "test_adaptive_tempered_smc" + ]; + + pythonImportsCheck = [ + "blackjax" + ]; + + meta = with lib; { + homepage = "https://blackjax-devs.github.io/blackjax"; + description = "Sampling library designed for ease of use, speed and modularity"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 69bc78ddda65..2a0e2183cba5 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 11edb88848b3..d6eb12166a8a 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/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/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 21bdad355c06..65a5fc6444ec 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/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/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 1a4648d41382..5d570844862f 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -28,19 +28,16 @@ , icalendar , pandas , pythonImportsCheckHook -, contourpy -, xyzservices }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.0.3"; - format = "setuptools"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; + sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; }; patches = [ @@ -73,10 +70,10 @@ buildPythonPackage rec { requests nbconvert icalendar + pandas ]; propagatedBuildInputs = [ - contourpy pillow jinja2 python-dateutil @@ -84,10 +81,8 @@ buildPythonPackage rec { pyyaml tornado numpy - pandas packaging typing-extensions - xyzservices ] ++ lib.optionals ( isPy27 ) [ futures diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index fffdea592b73..f8f33c0021f2 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,9 +1,9 @@ -diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py -index 9af8691..4b93543 100644 ---- a/src/bokeh/util/compiler.py -+++ b/src/bokeh/util/compiler.py -@@ -415,8 +415,8 @@ def _detect_nodejs() -> str: - raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + +diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py +index a752aad7d..8af05ff63 100644 +--- a/bokeh/util/compiler.py ++++ b/bokeh/util/compiler.py +@@ -442,8 +442,8 @@ def _detect_nodejs(): + raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +11,5 @@ index 9af8691..4b93543 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path() -> str: + def _nodejs_path(): global _nodejs diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 2115eb273d66..360144a36976 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.53"; + version = "0.2.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-V7FNuVXKJqIOsDqwg6Bn2Vb9QnuQ1XYzE4m0x2ipXW8="; + sha256 = "sha256-OcXAlMc1/HdGJGjB0miTh7k9rH7cC0CZtwKSqePgPUY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix new file mode 100644 index 000000000000..52149b883060 --- /dev/null +++ b/pkgs/development/python-modules/brian2/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, jinja2 +, numpy +, pyparsing +, setuptools +, sympy +, pytest +, pytest-xdist +, python +}: + +buildPythonPackage rec { + pname = "brian2"; + version = "2.5.1"; + + src = fetchPypi { + pname = "Brian2"; + inherit version; + sha256 = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + }; + + propagatedBuildInputs = [ + cython + jinja2 + numpy + pyparsing + setuptools + sympy + ]; + + checkInputs = [ + pytest + pytest-xdist + ]; + + checkPhase = '' + runHook preCheck + # Cython cache lies in home directory + export HOME=$(mktemp -d) + cd $HOME && ${python.interpreter} -c "import brian2;assert brian2.test()" + runHook postCheck + ''; + + meta = with lib; { + description = "A clock-driven simulator for spiking neural networks"; + homepage = "https://briansimulator.org/"; + license = licenses.cecill21; + maintainers = with maintainers; [ jiegec ]; + }; +} diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index cd596cecbb9f..52ef0cd8ec20 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/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/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 9baacd74d9b4..20b43178ceab 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.5.1"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos="; + hash = "sha256-+8NM/lyXeO1/kkotGuTwYbzmTbmriiQPXeqmT13iRXg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 69c663f9ce0b..308bba80b31f 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "4.11.3"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo="; + hash = "sha256-/d+KTcwCU+OQJ7qzgKLiDUeuNwoySFQW8qZq2a4aQ/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 44d6e6f97833..bcdd7614ecd5 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # Tests often fail with StopIteration "test_isolat" diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index ee36e10531f1..e6f78dfc0bd7 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock }: +{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock, cairosvg, klein, jinja2 }: { www = buildPythonPackage rec { @@ -115,4 +115,28 @@ license = licenses.gpl2; }; }; + + badges = buildPythonPackage rec { + pname = "buildbot-badges"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; + }; + + buildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = [ cairosvg klein jinja2 ]; + + # No tests + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Badges Plugin"; + maintainers = with maintainers; [ julienmalka ]; + license = licenses.gpl2; + }; + }; + } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 8c5be6384f35..1a0ef99e7493 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros + setuptools cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; pythonImportsCheck = [ "bundlewrap" ]; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index d6b8112c7df6..dd1b7d51cfff 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -14,13 +14,15 @@ buildPythonPackage rec { pname = "caldav"; - version = "1.0.1"; + version = "1.1.1"; + + format = "setuptools"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1BGy4h0TpeiUNtUnj/BiGSfH4T9YXP8YGJ1+4UsRGug="; + hash = "sha256-nAvkzZcMl/h1rysF6YNjEbbLrQ4PYGrXCoKgZEyE6WI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 46ceee80c0f5..0787d4d09718 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.4"; + version = "1.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8="; + hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encodes objects and arrays as RFC 7159 JSON"; homepage = "https://github.com/matrix-org/python-canonicaljson"; + changelog = "https://github.com/matrix-org/python-canonicaljson/blob/v${version}/CHANGES.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6cd182e181c9..29feab25abef 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.17.5"; + version = "1.17.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-PLtIxA3XD9Mi33zRfciocJUml1HqGsWGITlLUKAJUss="; + hash = "sha256-917JTjNKvO/Gp9qvvd0Dd5Zjl+AQzUw8PfbH2MQ14Dg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 0dfc302a49a5..2c4d3bb23516 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.1.1"; + version = "1.0.5"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; + rev = "v${version}"; + sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; }; nativeBuildInputs = [ clang_12 ]; diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 4fbe2ecd3792..767071a75ef2 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "certomancer"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certomancer"; rev = version; - sha256 = "sha256-H43NlFNTwZtedHsB7c62MocwQVOi5JjVJxRcZY+Wn7Y="; + sha256 = "4v2e46ZrzhKXpMULj0vmDRoLOypi030eaADAYjLMg5M="; }; propagatedBuildInputs = [ @@ -43,9 +43,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-runner'" "" \ - --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" + substituteInPlace setup.py --replace ", 'pytest-runner'" "" ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 966daaf1ea1e..c988ab49a75b 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.11.0"; + version = "5.13.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA="; + sha256 = "sha256-j4n5goW2Iu5Z1+Gta1Ar34WXaF8ryUKs5P+6Onhmyh0="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 8a3e328313f9..832cac1f7872 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -3,48 +3,41 @@ , build , buildPythonPackage , fetchPypi -, fetchpatch , git -, mock , pep517 , pytestCheckHook -, toml +, tomli , pythonOlder }: buildPythonPackage rec { pname = "check-manifest"; - version = "0.48"; + version = "0.49"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; + hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY="; }; - patches = [ - # Fix git submodule tests using file: protocol - (fetchpatch { - url = "https://github.com/mgedmin/check-manifest/pull/159.patch"; - hash = "sha256-CDtuIoHgP4THLt+xF32C/OrjakwPOEVTKUh5JuQB5wM="; - }) - ]; - propagatedBuildInputs = [ build pep517 - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ - breezy git - mock pytestCheckHook ]; + checkInputs = [ + breezy + ]; + disabledTests = [ # Test wants to setup a venv "test_build_sdist_pep517_isolated" @@ -57,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Check MANIFEST.in in a Python source package for completeness"; homepage = "https://github.com/mgedmin/check-manifest"; + changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; }; diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock index ad3755638df3..5e120ecc88d8 100644 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ b/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -29,7 +29,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -132,7 +132,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chia" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia-protocol", "clvm-utils", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "chia-bls" -version = "0.1.15" +version = "0.2.0" dependencies = [ "anyhow", "bls12_381_plus", @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "chia-protocol" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia_py_streamable_macro", "chia_streamable_macro", @@ -180,7 +180,7 @@ dependencies = [ [[package]] name = "chia_rs" -version = "0.1.16" +version = "0.2.0" dependencies = [ "chia", "chia-protocol", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "chia_wasm" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia", "wasm-bindgen", @@ -258,16 +258,16 @@ dependencies = [ [[package]] name = "clvm-utils" -version = "0.1.15" +version = "0.2.0" dependencies = [ "clvmr", ] [[package]] name = "clvmr" -version = "0.1.24" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4" +checksum = "8c6bb157d96f8309f2081663887e055b6f500f00d50235290690988d11197e84" dependencies = [ "bls12_381", "hex", @@ -478,9 +478,9 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" dependencies = [ "proc-macro2", "quote", @@ -542,6 +542,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -652,9 +661,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" @@ -673,9 +682,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -737,19 +746,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oorandom" @@ -867,15 +876,15 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -931,9 +940,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -1007,9 +1016,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "regex-syntax", ] @@ -1037,9 +1046,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "same-file" @@ -1064,24 +1073,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -1090,9 +1099,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -1152,9 +1161,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -1187,18 +1196,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1257,9 +1266,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -1278,9 +1287,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "version_check" diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index 649edb7b41b3..b8ce9ce755bc 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.1.16"; + version = "0.2.0"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = "refs/tags/${version}"; - sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; + rev = version; + hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; }; patches = [ diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 40018a49c8cc..52cd1a8cf28a 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , dnspython +, deprecat , fetchFromGitHub , loguru , passlib @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.50"; + version = "1.7.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpenning"; repo = pname; - rev = version; - hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg="; + rev = "refs/tags/${version}"; + hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco="; }; postPatch = '' @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib + deprecat dnspython loguru toml @@ -51,6 +53,8 @@ buildPythonPackage rec { # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" + # Path issues with configuration files + "testParse_valid_filepath" ]; pythonImportsCheck = [ @@ -58,8 +62,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Module to parse, audit, query, build, and modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; + changelog = "https://github.com/mpenning/ciscoconfparse/blob/${version}/CHANGES.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index a8811d7f37ac..109a29ac79ef 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.36"; + version = "9.2.38"; 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-nKUp8N1T6fcXd1V9Ppqb5fFy8UHGPE/tiyHIanhgUoE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e1f022c1a463..512d105914b3 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.36"; + version = "9.2.38"; # 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-3B62NMlAGv4Q6HOkACafBETbOj4QsWsvfrTAM+5b9NY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index b38d61f6fa01..e1bd8e4f8b7b 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ="; + sha256 = "sha256-bwqzyhQbUI2gPOGb1S8eXo0pdz/DBi1782RQqCIH7Bs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix index 0e82989caadb..1e3a55486156 100644 --- a/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ b/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clvm-tools-rs"; - version = "0.1.25"; + version = "0.1.30"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw="; + sha256 = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk="; + sha256 = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/cmaes/default.nix b/pkgs/development/python-modules/cmaes/default.nix new file mode 100644 index 000000000000..fdb2a1d0fcc0 --- /dev/null +++ b/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/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index e3ca8380c659..92ed4362ece8 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/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/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index c51dd9ecc95e..0dc799d7ea23 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg="; + sha256 = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index c4d20c23d3f2..d1545d36b376 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -5,6 +5,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -12,7 +13,8 @@ buildPythonPackage rec { version = "2.0.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + # https://github.com/mlenzen/collections-extended/issues/198 + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "mlenzen"; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index df12b6a98af1..932e434d923d 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "configobj"; - version = "5.0.6"; + version = "5.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DiffSK"; repo = pname; - rev = "v${version}"; - hash = "sha256-HMLYzVMnxvMpb3ORsbKy18oU/NkuRT0isK6NaUk6J3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-t3Q0FEBibkAM5PAG4fjXwNH/71RqSSDj/Mn27ri0iDU="; }; propagatedBuildInputs = [ @@ -26,17 +26,21 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytestCheckHook ]; + checkInputs = [ + mock + ]; + pythonImportsCheck = [ "configobj" ]; meta = with lib; { description = "Config file reading, writing and validation"; - homepage = "https://pypi.python.org/pypi/configobj"; + homepage = "https://github.com/DiffSK/configobj"; + changelog = "https://github.com/DiffSK/configobj/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 9b7914e5b9c1..ed40735a2063 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -66,6 +66,10 @@ buildPythonPackage rec { "TestVMDKConversion" # CLI test fails with AssertionError "test_help" + # Failing TestCOTDeployESXi tests + "test_serial_fixup_stubbed" + "test_serial_fixup_stubbed_create" + "test_serial_fixup_stubbed_vm_not_found" ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index c546d11ec3f6..d47debe407e9 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -51,16 +51,16 @@ buildPythonPackage rec { export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' export CVXOPT_BUILD_GSL=1 - export CVXOPT_GSL_LIB_DIR=${gsl}/lib - export CVXOPT_GSL_INC_DIR=${gsl}/include + export CVXOPT_GSL_LIB_DIR=${lib.getLib gsl}/lib + export CVXOPT_GSL_INC_DIR=${lib.getDev gsl}/include '' + lib.optionalString withGlpk '' export CVXOPT_BUILD_GLPK=1 - export CVXOPT_GLPK_LIB_DIR=${glpk}/lib - export CVXOPT_GLPK_INC_DIR=${glpk}/include + export CVXOPT_GLPK_LIB_DIR=${lib.getLib glpk}/lib + export CVXOPT_GLPK_INC_DIR=${lib.getDev glpk}/include '' + lib.optionalString withFftw '' export CVXOPT_BUILD_FFTW=1 - export CVXOPT_FFTW_LIB_DIR=${fftw}/lib - export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include + export CVXOPT_FFTW_LIB_DIR=${lib.getLib fftw}/lib + export CVXOPT_FFTW_INC_DIR=${lib.getDev fftw}/include ''; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 3fd18bd03007..3ca704d1066c 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.3"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y="; + hash = "sha256-Zszme9xjW5spBmUQR0OSwM/A2V24rdpAENyM3Y4EYlA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index 2f605950bc59..0c0618f9c3d0 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.22"; + version = "0.23"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vOIheOcDG8qdPtcN0kkBN3URodknDLTC7BzYGIiD2RA="; + hash = "sha256-tr4QQ/p0jx/e5kHx4WSYfo06/qMNFyxIGsaAA8nBBoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index f859a43bd1e2..a43f1a5afb57 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, arrow-cpp , bokeh , buildPythonPackage , click @@ -70,13 +71,14 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - fastparquet - pyarrow pytestCheckHook pytest-rerunfailures pytest-xdist scipy zarr + ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 + fastparquet + pyarrow ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/datafusion/Cargo.lock.patch b/pkgs/development/python-modules/datafusion/Cargo.lock.patch deleted file mode 100644 index e4e5eca8af4c..000000000000 --- a/pkgs/development/python-modules/datafusion/Cargo.lock.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index fa84a54c..3d790e1c 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,9 +57,9 @@ checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" - - [[package]] - name = "arrow" --version = "6.0.0" -+version = "6.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "337e668497751234149fd607f5cb41a6ae7b286b6329589126fe67f0ac55d637" -+checksum = "216c6846a292bdd93c2b93c1baab58c32ff50e2ab5e8d50db333ab518535dd8b" - dependencies = [ - "bitflags", - "chrono", -@@ -212,9 +212,9 @@ dependencies = [ - - [[package]] - name = "comfy-table" --version = "4.1.1" -+version = "5.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" -+checksum = "c42350b81f044f576ff88ac750419f914abb46a03831bb1747134344ee7a4e64" - dependencies = [ - "strum", - "strum_macros", -@@ -279,7 +279,7 @@ dependencies = [ - - [[package]] - name = "datafusion" --version = "5.1.0" -+version = "6.0.0" - dependencies = [ - "ahash", - "arrow", -@@ -310,7 +310,7 @@ dependencies = [ - - [[package]] - name = "datafusion-python" --version = "0.3.0" -+version = "0.4.0" - dependencies = [ - "datafusion", - "pyo3", -@@ -877,9 +877,9 @@ dependencies = [ - - [[package]] - name = "parquet" --version = "6.0.0" -+version = "6.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d263b9b59ba260518de9e57bd65931c3f765fea0fabacfe84f40d6fde38e841a" -+checksum = "788d9953f4cfbe9db1beff7bebd54299d105e34680d78b82b1ddc85d432cac9d" - dependencies = [ - "arrow", - "base64", -@@ -1228,15 +1228,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - - [[package]] - name = "strum" --version = "0.21.0" -+version = "0.22.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" -+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" - - [[package]] - name = "strum_macros" --version = "0.21.1" -+version = "0.22.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" - dependencies = [ - "heck", - "proc-macro2", diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index fb991dabf3d2..84afbfc3a1c1 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -5,54 +5,42 @@ , fetchPypi , fetchFromGitHub , rustPlatform -, maturin , pytestCheckHook , libiconv , numpy , pandas , pyarrow -, pytest }: + let - # le sigh, the perils of unrelated versions of software living in the same - # repo: there's no obvious way to map the top level source repo - # (arrow-datafusion) version to the version of contained repo - # (arrow-datafusion/python) - # - # A commit hash will do in a pinch, and ultimately the sha256 has the final - # say of what the content is when building - cargoLock = fetchurl { - url = "https://raw.githubusercontent.com/apache/arrow-datafusion/6.0.0/python/Cargo.lock"; - sha256 = "sha256-xiv3drEU5jOGsEIh0U01ZQ1NBKobxO2ctp4mxy9iigw="; + arrow-testing = fetchFromGitHub { + owner = "apache"; + repo = "arrow-testing"; + rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; + hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; }; - postUnpack = '' - cp "${cargoLock}" $sourceRoot/Cargo.lock - chmod u+w $sourceRoot/Cargo.lock - ''; + parquet-testing = fetchFromGitHub { + owner = "apache"; + repo = "parquet-testing"; + rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2"; + hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg="; + }; in + buildPythonPackage rec { pname = "datafusion"; - version = "0.4.0"; + version = "0.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+YqogteKfNhtI2QbVXv/5CIWm3PcOH653dwONm5ZcL8="; + sha256 = "sha256-XYXZMorPs2Ue7E38DASd4rmxvX0wlx8A6sCpAbYUh4I="; }; - inherit postUnpack; - - # TODO: remove the patch hacking and postUnpack hooks after - # https://github.com/apache/arrow-datafusion/pull/1508 is merged - # - # the lock file isn't up to date as of 6.0.0 so we need to patch the source - # lockfile and the vendored cargo deps lockfile - patches = [ ./Cargo.lock.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src pname version postUnpack; - sha256 = "sha256-JGyDxpfBXzduJaMF1sbmRm7KJajHYdVSj+WbiSETiY0="; - patches = [ ./Cargo.lock.patch ]; + inherit src pname version; + sha256 = "sha256-6mPdKwsEN09Gf4eNsd/v3EBHVezHmff/KYB2lsXgzcA="; }; nativeBuildInputs = with rustPlatform; [ @@ -68,13 +56,18 @@ buildPythonPackage rec { pyarrow ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "datafusion" ]; + pytestFlagsArray = [ "--pyargs" pname ]; - checkPhase = '' - runHook preCheck - pytest --pyargs "${pname}" - runHook postCheck + preCheck = '' + pushd $TMPDIR + ln -s ${arrow-testing} ./testing + ln -s ${parquet-testing} ./parquet + ''; + + postCheck = '' + popd ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix new file mode 100644 index 000000000000..af221199c910 --- /dev/null +++ b/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/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 5115484424dd..5e1f9e45d6e7 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.6.1"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,17 +30,9 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg="; + hash = "sha256-A6rrChzHHd7vS1KWlF/EZEjp1CEE0mNn4AlMdSYLD/I="; }; - patches = [ - (fetchpatch { - # Backport support for dill<3.7 - url = "https://github.com/huggingface/datasets/pull/5166.patch"; - hash = "sha256-QigpXKHi2B60M/iIWSqvBU9hW5vBu6IHGML22aCMevo="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "responses<0.19" "responses" diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index b8f2fffe0e1a..09eff1461d5a 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.84.0"; + version = "1.84.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AdfrzN7ufvy77tKjnHPNo+jHoHRw9fXtdUdYvdnMAjs="; + hash = "sha256-L2+8mS7mTRWDQwXcYfJW3078N69AFY2vs4a4vi62XYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index e68cda8c0e25..eec2c9fd895c 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/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/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index b4921b2d1f44..f5ea937a4f15 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/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/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix new file mode 100644 index 000000000000..da81c63cca86 --- /dev/null +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, wrapt +}: + +buildPythonPackage rec { + pname = "deprecat"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mjhajharia"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + wrapt + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deprecat" + ]; + + meta = with lib; { + description = "Decorator to deprecate old python classes, functions or methods"; + homepage = "https://github.com/mjhajharia/deprecat"; + changelog = "https://github.com/mjhajharia/deprecat/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 840fbda9231b..29e5f915ccca 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/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/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index e13da65aee19..ccd426f94bad 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; - rev = version; - hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4="; + rev = "refs/tags/${version}"; + hash = "sha256-RlkTsAvX+9c69JBy+DZbcCfAvcCnWDisgdQQMBkphtg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; homepage = "https://github.com/fox-it/dissect.cim"; + changelog = "https://github.com/fox-it/dissect.cim/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 3e807d3bd260..d73d2145985f 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.clfs"; - rev = version; - hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI="; + rev = "refs/tags/${version}"; + hash = "sha256-QzEcJvujkNVUXtqu7yY7sJ/U55jzGBbUHxOVDxg4vac="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system"; homepage = "https://github.com/fox-it/dissect.clfs"; + changelog = "https://github.com/fox-it/dissect.clfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 722e1a75f775..6b0f74f16bd7 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; - rev = version; - hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ="; + rev = "refs/tags/${version}"; + hash = "sha256-tEWqw3ySF1ebOMztZwAlkTiY0mFCzTM58wD0XDfljFA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for C-like structures"; homepage = "https://github.com/fox-it/dissect.cstruct"; + changelog = "https://github.com/fox-it/dissect.cstruct/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 74c8bdf9ec70..e2188b70ff75 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; - rev = version; - hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc="; + rev = "refs/tags/${version}"; + hash = "sha256-wTzr9b95jhPbZVWM/C9T1OSBLK39sCIjbsNK/6Z83JE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Microsofts Extensible Storage Engine Database (ESEDB)"; homepage = "https://github.com/fox-it/dissect.esedb"; + changelog = "https://github.com/fox-it/dissect.esedb/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index ffde95490763..6c0bc54c42fb 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; - rev = version; - hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU="; + rev = "refs/tags/${version}"; + hash = "sha256-rEYWTMBzMyaADqT1Pp5z1J2Uf/t/GeX/FAnZVnaycYs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Event Trace Log (ETL) files"; homepage = "https://github.com/fox-it/dissect.etl"; + changelog = "https://github.com/fox-it/dissect.etl/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 7fa3e68cabc6..00021187679e 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; - rev = version; - hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM="; + rev = "refs/tags/${version}"; + hash = "sha256-PbU9Rd0D+xdleTIMAV+esw1WynWU4++8KeXlHS9yiJs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for the Windows EVT, EVTX and WEVT log file formats"; homepage = "https://github.com/fox-it/dissect.eventlog"; + changelog = "https://github.com/fox-it/dissect.eventlog/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index f6608aac9f71..ed3cbb56eb07 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.evidence"; - rev = version; - hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY="; + rev = "refs/tags/${version}"; + hash = "sha256-R4ua7JeT09GkoBwM2YGf2T0PJXhldUpqAS3xsB9L79c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for various forensic evidence file containers"; homepage = "https://github.com/fox-it/dissect.evidence"; + changelog = "https://github.com/fox-it/dissect.evidence/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix new file mode 100644 index 000000000000..0b932de9a2a2 --- /dev/null +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, setuptools +, setuptools-scm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dissect-executable"; + version = "1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.executable"; + rev = "refs/tags/${version}"; + hash = "sha256-c58g2L3B/3/pC+iyXphYsjhpBs0I0Q64B8+rv5k1dtg="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + pythonImportsCheck = [ + "dissect.executable" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for various executable formats such as PE, ELF and Macho-O"; + homepage = "https://github.com/fox-it/dissect.executable"; + changelog = "https://github.com/fox-it/dissect.executable/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 45aea2685d59..f337d3ae8efd 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; - rev = version; - hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324="; + rev = "refs/tags/${version}"; + hash = "sha256-VCPNY/4SUkFpLuSs2Cxu8u5qt2sQ9VGlfdPssybxhk8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the ExtFS file system"; homepage = "https://github.com/fox-it/dissect.extfs"; + changelog = "https://github.com/fox-it/dissect.extfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 47b2cafdb813..b384fb5cba9f 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.fat"; - rev = version; - hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg="; + rev = "refs/tags/${version}"; + hash = "sha256-v4GjI6DdDfxO3kGZ7Z5C6mkdRj9axsT9mvlSOQyiMBw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FAT file system"; homepage = "https://github.com/fox-it/dissect.fat"; + changelog = "https://github.com/fox-it/dissect.fat/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index fd4d4372e2ac..37f95807fcc6 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; - rev = version; - hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U="; + rev = "refs/tags/${version}"; + hash = "sha256-nGxojXslFVcqU+9StBOacmCyoZJJB4B4OIvql/cbcZE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FFS file system"; homepage = "https://github.com/fox-it/dissect.ffs"; + changelog = "https://github.com/fox-it/dissect.ffs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 92c885907f15..b5ee17918a6f 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.hypervisor"; - rev = version; - hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo="; + rev = "refs/tags/${version}"; + hash = "sha256-dWaU3v2QcoqVIygeufy0ZYVliBE1tijV3qEsvCOIarM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files"; homepage = "https://github.com/fox-it/dissect.hypervisor"; + changelog = "https://github.com/fox-it/dissect.hypervisor/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 1b27129e9d58..611f9b56226e 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; - rev = version; - hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw="; + rev = "refs/tags/${version}"; + hash = "sha256-xhtAN0QaLLbQk/aAd9PlEkyW39w33iPaQtGzbouI6hc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the NTFS file system"; homepage = "https://github.com/fox-it/dissect.ntfs"; + changelog = "https://github.com/fox-it/dissect.ntfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index fb5ead471abb..5540c62a8baf 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; - rev = version; - hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY="; + rev = "refs/tags/${version}"; + hash = "sha256-m2+AcKp8rH+VQIdT85oKoA8QoyNQOmrZ2DvBELZnEqM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format"; homepage = "https://github.com/fox-it/dissect.ole"; + changelog = "https://github.com/fox-it/dissect.ole/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index d731aeb68a08..c453cbf9a439 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; - rev = version; - hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4="; + rev = "refs/tags/${version}"; + hash = "sha256-3QJ1N9LukvEa74rndN/Sj6Vq10YJVBsOGdlMzR9TrKA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Windows registry file format"; homepage = "https://github.com/fox-it/dissect.regf"; + changelog = "https://github.com/fox-it/dissect.regf/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 4a4b3802128e..c0f4228593a6 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; - rev = version; - hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg="; + rev = "refs/tags/${version}"; + hash = "sha256-flTv2Y+UwMTQnvqRS/pZRPkTsIjvCAp7B4rKAQPOJL4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; homepage = "https://github.com/fox-it/dissect.shellitem"; + changelog = "https://github.com/fox-it/dissect.shellitem/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 55e52c9c9120..69bfbb4a659e 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; - rev = version; - hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0="; + rev = "refs/tags/${version}"; + hash = "sha256-sIXFEckHFr9H4oGFw8uuC+c54PR8ZbQxJKb5x5EixxQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for the SQLite database file format"; homepage = "https://github.com/fox-it/dissect.sql"; + changelog = "https://github.com/fox-it/dissect.sql/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix new file mode 100644 index 000000000000..1413b352f03c --- /dev/null +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, lz4 +, python-lzo +, pythonOlder +, setuptools +, setuptools-scm +, zstandard +}: + +buildPythonPackage rec { + pname = "dissect-squashfs"; + version = "1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.squashfs"; + rev = "refs/tags/${version}"; + hash = "sha256-bDR6GAgl1dOhZ3fWA7E27KS6pj9AXInNxwmwNXXV3lc="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + passthru.optional-dependencies = { + full = [ + lz4 + python-lzo + zstandard + ]; + }; + + pythonImportsCheck = [ + "dissect.squashfs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the SquashFS file system"; + homepage = "https://github.com/fox-it/dissect.squashfs"; + changelog = "https://github.com/fox-it/dissect.squashfs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 0c69d93ef3ee..65786ef0a9e2 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -24,6 +24,7 @@ , flow-record , fusepy , ipython +, pycryptodome , pytestCheckHook , pythonOlder , pyyaml @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.4"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -44,8 +45,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; - rev = version; - hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4="; + rev = "refs/tags/${version}"; + hash = "sha256-jFQ8BxCC4PW135igfXA5EmlWYIZ0zF12suiUMiLbArA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +57,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-eventlog dissect-evidence @@ -71,7 +73,6 @@ buildPythonPackage rec { passthru.optional-dependencies = { full = [ asn1crypto - defusedxml dissect-cim dissect-clfs dissect-esedb @@ -84,6 +85,7 @@ buildPythonPackage rec { dissect-xfs fusepy ipython + pycryptodome pyyaml yara-python zstandard @@ -101,11 +103,14 @@ buildPythonPackage rec { disabledTests = [ # Test requires rdump "test_exec_target_command" + # Issue with tar file + "test_tar_sensitive_drive_letter" ]; meta = with lib; { description = "Dissect module that provides a programming API and command line tools"; homepage = "https://github.com/fox-it/dissect.target"; + changelog = "https://github.com/fox-it/dissect.target/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index ca48d44d344d..8a47b9eeaab0 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.1"; + version = "1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.thumbcache"; - rev = version; - hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4="; + rev = "refs/tags/${version}"; + hash = "sha256-lTtTZQgEvgaVoNPnVeRGO/BQU/8RfQ2ktljSBflhlOw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows thumbcache"; homepage = "https://github.com/fox-it/dissect.thumbcache"; + changelog = "https://github.com/fox-it/dissect.thumbcache/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index cac7233b9efb..b816656a53b1 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.3"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; - rev = version; - hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ="; + rev = "refs/tags/${version}"; + hash = "sha256-hijwu2QT9xJZ1F0wz5NO0mAVe/VA3JcPmoEYQiQRLtM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.util"; + changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index a520ce8c05a5..0834e967b2d6 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; - rev = version; - hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI="; + rev = "refs/tags/${version}"; + hash = "sha256-9+1geOJ+vzy6+eGibX+BUHbtzyLhq3MPBsad98ykn3I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the VMFS file system"; homepage = "https://github.com/fox-it/dissect.vmfs"; + changelog = "https://github.com/fox-it/dissect.vmfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index cff900efbefa..9053d83f0e49 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; - rev = version; - hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM="; + rev = "refs/tags/${version}"; + hash = "sha256-5O2ywPJi9M7gvcreS7DrW2qJ32MoR3Qero7jJ5gv0ow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.volume"; + changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 60a7ee1abb2f..772e223c5979 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; - rev = version; - hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk="; + rev = "refs/tags/${version}"; + hash = "sha256-OasoZ+HGvW8PPWDBvKdrfiE3FqnXPx0xjBVFWLBYHwQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the XFS file system"; homepage = "https://github.com/fox-it/dissect.xfs"; + changelog = "https://github.com/fox-it/dissect.xfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index e6da0a1a6a8e..59db158b6636 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -10,12 +10,14 @@ , dissect-extfs , dissect-fat , dissect-ffs +, dissect-executable , dissect-hypervisor , dissect-ntfs , dissect-ole , dissect-regf , dissect-shellitem , dissect-sql +, dissect-squashfs , dissect-target , dissect-util , dissect-vmfs @@ -29,7 +31,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; - rev = version; - hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY="; + rev = "refs/tags/${version}"; + hash = "sha256-+t6v553lP9NEimNlp48NQ+6dpIOrgfZ1FU3LNJF44YY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +58,7 @@ buildPythonPackage rec { dissect-etl dissect-eventlog dissect-evidence + dissect-executable dissect-extfs dissect-fat dissect-ffs @@ -65,6 +68,7 @@ buildPythonPackage rec { dissect-regf dissect-shellitem dissect-sql + dissect-squashfs dissect-target dissect-util dissect-vmfs @@ -82,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect meta module"; homepage = "https://github.com/fox-it/dissect"; + changelog = "https://github.com/fox-it/dissect/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index d0894177c3f9..a0bfca2a8b2b 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/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/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 7b5b6c67cff4..d550ea9862d4 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; + hash = "sha256-BzvtoY4pKfpc2DuvvKr5deWUXoShe/qBkny2yfWhe5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index f881ed5221ae..f54562742b15 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.16"; + version = "3.2.17"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-OtwoUSQkRySjlPqbmDnMjNEW+vfRWVVMQ+zaqM3wuU0="; + hash = "sha256-ZEKINB8G6+STjuxoAba9WaZTSnjkrt3ioVMHXREUOJQ="; }; patches = [ diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8a53a9d1d58f..0b420e9362c9 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/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/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 2728d77d3f80..dd6e054b55c3 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/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/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index c4d1d300cca7..3fd274a2c9a0 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "djangorestframework-camel-case"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-31kTYv+kSMjwo1TFauilP7eruxXiIpUdDG9feBYzkH4="; + sha256 = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index f7be25f61509..0eb7506a2ce1 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/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/pkgs/development/python-modules/docformatter/test-path.patch b/pkgs/development/python-modules/docformatter/test-path.patch new file mode 100644 index 000000000000..bd61c0ca829b --- /dev/null +++ b/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/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index eca45373fab7..4853e7eb0825 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.4"; + version = "1.21.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iHyfeeZPRqpIl0I05hApsb6msS6mKKj8ijaXWJrdHT4="; + sha256 = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index b9c9e65a4fe6..301d99aabe0c 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/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/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ec4a1a93ca43..315c0f8763b8 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.21.0"; + version = "0.21.2"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-wizAXwIKlq012U1lIPgHAnC+4KN7V1aG0JwCeYsl7YY="; + hash = "sha256-2GWuf9lJfWTONFpnhP8XdbATF/upYy750t/Xl48bDU8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 56a27acb6019..316e20f91d0e 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/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/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index c20540b8eeb3..a0ab592eaa90 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/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/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 739ace442b95..b9c49e30a560 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -1,40 +1,52 @@ -{ buildPythonPackage -, fetchPypi -, lib -, isPy3k -, six +{ lib , attrs -, pytest +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, six , testtools }: buildPythonPackage rec { - version = "1.1.0"; pname = "effect"; - disabled = (!isPy3k); + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; + hash = "sha256-ev+2A3B8ZIsHsReB67eTpLmu6KzxrFdkw+0hEq3wyeo="; }; + postPatch = '' + substituteInPlace effect/test_do.py \ + --replace "py.test" "pytest" + ''; + + propagatedBuildInputs = [ + attrs + six + ]; + nativeCheckInputs = [ - pytest + pytestCheckHook + ]; + + checkInputs = [ testtools ]; - propagatedBuildInputs = [ - six - attrs + pythonImportsCheck = [ + "effect" ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Pure effects for Python"; - homepage = "https://github.com/python-effect/effect"; + homepage = "https://effect.readthedocs.io/"; + changelog = "https://github.com/python-effect/effect/releases/tag/${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 0f44f7b8fb02..b7286ad39c26 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , aiohttp , blinker , buildPythonPackage @@ -30,7 +29,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.14.0"; + version = "6.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +38,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-T1TWILlJZffTISVt8YSi8ZYSXOHieh6SV55j8W333LQ="; + hash = "sha256-Uoybe6Mx7ZLs2GaOnl278Xj6KlTEgrOuNxMRmPpSq8k="; }; propagatedBuildInputs = [ @@ -54,22 +53,18 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - checkInputs = [ - asynctest ecs-logging + httpx jinja2 jsonschema Logbook mock - httpx pytest-asyncio pytest-bdd - pytest-mock pytest-localserver + pytest-mock pytest-random-order + pytestCheckHook sanic-testing structlog webob diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 0aa5c6583784..14876fa30d39 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "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/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 65cae10f0e21..fc822e1ece15 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc="; + hash = "sha256-Zo5mH+AAi75vbjsV0UmEOrXKw1IUwspjWStJa+PI/as="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index d444c06901f1..265e2f7716ae 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/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/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 1869ea45fcf0..a3fc50c350b1 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY="; + hash = "sha256-Rz+oEpgfvSRdly+H1bYxYjNCfo1STkLcogPgZs+b8DY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index d4a878b6a15f..abe18fb3e3f1 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.6.0"; + version = "2.9.0"; 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-7sX+XDhyMtijwcwKK1Bt7n26v24qinb4HDVQD8zUg2M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 92c52fe5e956..e9c03b10ae61 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/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/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 2b63ee846b84..82522db24ae2 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU="; + hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix new file mode 100644 index 000000000000..9e46a4b8ceeb --- /dev/null +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pybind11 +}: + +buildPythonPackage rec { + pname = "fasttext-predict"; + version = "0.9.2.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw="; + }; + + nativeBuildInputs = [ + pybind11 + ]; + + # tests are removed from fork + doCheck = false; + + pythonImportsCheck = [ "fasttext" ]; + + meta = with lib; { + description = "fasttext with wheels and no external dependency, but only the predict method (<1MB)"; + homepage = "https://github.com/searxng/fasttext-predict/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index fec7fac990cd..3e9430ef318b 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,29 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder, cython -, attrs, click, cligj, click-plugins, six, munch, enum34 -, pytestCheckHook, boto3, mock, giflib, pytz -, gdal, certifi +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, gdal +, setuptools +, attrs +, certifi +, click +, click-plugins +, cligj +, munch +, shapely +, boto3 +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "fiona"; - version = "1.9.0"; + version = "1.9.1"; - src = fetchPypi { - pname = "Fiona"; - inherit version; - hash = "sha256-bkh8v7pahJ+98G5FFp/X4fFmL0Tz1xerS5RgRrJFfq4="; + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "Fiona"; + rev = "refs/tags/${version}"; + hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; }; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - nativeBuildInputs = [ cython gdal # for gdal-config + setuptools ]; buildInputs = [ gdal - ] ++ lib.optionals stdenv.cc.isClang [ giflib ]; + ]; propagatedBuildInputs = [ attrs @@ -31,32 +48,33 @@ buildPythonPackage rec { click cligj click-plugins - six munch - pytz - ] ++ lib.optional (!isPy3k) enum34; + setuptools + ]; + + passthru.optional-dependencies = { + calc = [ shapely ]; + s3 = [ boto3 ]; + }; nativeCheckInputs = [ pytestCheckHook - boto3 - ] ++ lib.optional (pythonOlder "3.4") mock; + pytz + ] ++ passthru.optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona - # disable gdal deprecation warnings - export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # https://github.com/Toblerity/Fiona/issues/1164 - "test_no_append_driver_cannot_append" ]; pythonImportsCheck = [ "fiona" ]; meta = with lib; { + changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index fa7ffee5a9cc..0222ea21c983 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "flask-babel"; - version = "3.0.0"; + version = "3.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "python-babel"; repo = "flask-babel"; rev = "refs/tags/v${version}"; - hash = "sha256-c3QKAnyMe1THHuJ3uB2d0jMMo1SYGRAB9mBpIJSAHw0="; + hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk="; }; outputs = [ diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 961e1a644baa..20dd72b662ce 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; + sha256 = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index f19030782827..12b340639f79 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g="; + sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; }; buildInputs = [ jaxlib ]; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index b46b1df5410a..825c7f19436b 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.7"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; - rev = version; - hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8="; + rev = "refs/tags/${version}"; + hash = "sha256-hvd5I1n3lOuP9sUtVO69yGCVOVEWYKKfFf7OjAJCXIg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for defining and creating structured data"; homepage = "https://github.com/fox-it/flow.record"; + changelog = "https://github.com/fox-it/flow.record/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix new file mode 100644 index 000000000000..9755fed90238 --- /dev/null +++ b/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/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix index 8b0425c38817..5b6bce687ea3 100644 --- a/pkgs/development/python-modules/fortiosapi/default.nix +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -5,18 +5,23 @@ , packaging , paramiko , pexpect +, pythonOlder , requests +, six }: buildPythonPackage rec { pname = "fortiosapi"; version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fortinet-solutions-cse"; repo = pname; - rev = "v${version}"; - sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k"; + rev = "refs/tags/v${version}"; + hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg="; }; propagatedBuildInputs = [ @@ -25,11 +30,15 @@ buildPythonPackage rec { paramiko packaging oyaml + six ]; # Tests require a local VM doCheck = false; - pythonImportsCheck = [ "fortiosapi" ]; + + pythonImportsCheck = [ + "fortiosapi" + ]; meta = with lib; { description = "Python module to work with Fortigate/Fortios devices"; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index fb2d0b166889..e1c22cd57885 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "sha256-iUPreJ8BSB8LDisbJis0xn8ld6+Nf9Z4AP8SWJlCfZg="; + sha256 = "sha256-T6l6hKzRDevlLyLu5H+bnEdl0OhsPer1coCDiftbPAk="; }; - patches = [ - (fetchpatch { - name = "remove-strategies-doctest.patch"; - url = "https://github.com/fplll/fpylll/commit/3edffcd189e9d827a322d83b0f84d32e5f067442.patch"; - sha256 = "sha256-U7qOIbVzUNwYmjOPryjnE3J+MX/vMwm3T0UyOZ5ylLc="; - }) - ]; - buildInputs = [ gmp pari diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index c6306da0ee63..f2a772d1ad66 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "gbulb"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "beeware"; repo = "gbulb"; - rev = "v${version}"; - sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AdZSvxix0cpoFQSrslGl+hB/s6Nh0EsWMQmXZAJVJOg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index c7ddc590d97d..7f802a10b10f 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.6.0"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; + hash = "sha256-/2pPAymq6dek2NsInD+ga+CYOTG7BPgWGNm7Iwp2GHg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdtoolkit/default.nix b/pkgs/development/python-modules/gdtoolkit/default.nix deleted file mode 100644 index 5323e12e4c55..000000000000 --- a/pkgs/development/python-modules/gdtoolkit/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, lark, docopt, pyyaml, setuptools }: - -let lark080 = lark.overrideAttrs (old: rec { - # gdtoolkit needs exactly this lark version - version = "0.8.0"; - src = fetchFromGitHub { - owner = "lark-parser"; - repo = "lark"; - rev = version; - sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4="; - }; -}); - -in -buildPythonPackage rec { - pname = "gdtoolkit"; - version = "3.3.1"; - - propagatedBuildInputs = [ - lark080 - docopt - pyyaml - setuptools - ]; - - # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) - src = fetchFromGitHub { - owner = "Scony"; - repo = "godot-gdscript-toolkit"; - rev = version; - sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; - }; - - disabled = pythonOlder "3.7"; - - # Tests cannot be run because they need network to install additional dependencies using pip and tox - doCheck = false; - pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; - - meta = with lib; { - description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; - homepage = "https://github.com/Scony/godot-gdscript-toolkit"; - license = licenses.mit; - maintainers = with maintainers; [ shiryel ]; - }; -} diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 406beae748b6..183454dac89d 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/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/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 05b638559aec..49d58eab82c6 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/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/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index b7f65f9e7843..00f49fbdaea5 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/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/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 57f869842c83..c04bb6e7f873 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.15.1"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4="; + hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 31d7127519e4..3676c1a4e137 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.23"; + version = "0.2.25"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-SX49v+DuV4IZdTJc9XhqhgtG81qLC9QnR/LPMu2m0fo="; + sha256 = "sha256-RT8fkFHiqUaahowk6EDpaf8s4JUuHSHPNT0iEr/pDVg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 41a9238d7a98..be7f59341834 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.4.2"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; + hash = "sha256-3TyoTlvm+p4FcPshZlqQLMVlHL0EWEL7cUFkyZomOcQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6c022b84ab75..64cdac603e0b 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/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.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; + hash = "sha256-sYF6yV/VENn11V74vWU2p/pSkPAfYPtW2l1TdHTSR2g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 5a062f4a85c2..b9dfd63441ba 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o="; + hash = "sha256-bwl1gWLux5LJMZIS/tJFMhHs1LcaDVCTgNrke6ASiBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 26446cc412e5..cefa183916a6 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; + hash = "sha256-KLPGICGwT3j5FYwVfb/K6+n/tQTt0pda0PIo6/AgTG8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 1c0536749019..18c57e8898b1 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.27.0"; + version = "3.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6zrAz+VqO8ojC+E0wcYMktZpnWF7skSj6R4GRrJ3nOs="; + hash = "sha256-1/pGE8Ql50B8hY4I/o5AhPIDOuE3EQcro2zMN23zLsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 7c57cc560eb7..2de8604ccfb4 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/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/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 233d0bbbce81..2678c0120bee 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.22.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HAUHNxO7dfocazGhcvvcqbZot/RkAP50DrsEkocOugI="; + hash = "sha256-/uv4P7wB/5QQW2IA+PT6VMPWd91Aoyxsez+8ptrIa5M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix new file mode 100644 index 000000000000..4e43915c86df --- /dev/null +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, opencv4 +, pillow +, scikitlearn +, torch +, torchvision +, ttach +, tqdm +}: + +buildPythonPackage rec { + pname = "grad-cam"; + version = "1.4.6"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + matplotlib + numpy + opencv4 + pillow + scikitlearn + torchvision + ttach + tqdm + ]; + + # Let the user bring their own instance (as with torchmetrics) + buildInputs = [ + torch + ]; + + doCheck = false; # every nontrivial test tries to download a pretrained model + + pythonImportsCheck = [ + "pytorch_grad_cam" + "pytorch_grad_cam.metrics" + "pytorch_grad_cam.metrics.cam_mult_image" + "pytorch_grad_cam.metrics.road" + "pytorch_grad_cam.utils" + "pytorch_grad_cam.utils.image" + "pytorch_grad_cam.utils.model_targets" + ]; + + meta = with lib; { + description = "Advanced AI explainability for computer vision."; + homepage = "https://jacobgil.github.io/pytorch-gradcam-book"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 0cdf472be099..30a724c07c44 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/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/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index 2d4fbf506408..65bbc142e325 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gridnet"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-gridnet"; rev = "refs/tags/v${version}"; - hash = "sha256-/UBZVbDRZMYHDrgifpYSTygAQTBiqgZ0tRGncE3GeT4="; + hash = "sha256-Enld68P9Cyq9Au4bsZQqPV26TL72pcmIm/Vg1DnheLk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 692b2fe6d8e6..8dfabb097296 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.25.4"; + version = "0.25.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AZZhwHtVhdHkztzr/Hdi63VC5CjK2Vz8h8zizmSUdNY="; + hash = "sha256-0+n5v93ERcQDKNtXxSZYfCUMTRzcbtQEXl023KSxfrE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index c956d139942b..9e38225571d9 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + preBuild = lib.optionalString mpiSupport "export CC=${mpi}/bin/mpicc"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 9fd1295733c4..0da05c75f2db 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,18 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, async-timeout }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, async-timeout +}: buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.0.2"; + version = "3.1.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; + hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s="; }; - propagatedBuildInputs = [ async-timeout ]; + propagatedBuildInputs = [ + async-timeout + ]; # only manual tests doCheck = false; @@ -24,8 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/pvizeli/ha-ffmpeg"; - description = "Library for home-assistant to handle ffmpeg"; + description = "Library for Home Assistant to handle ffmpeg"; + homepage = "https://github.com/home-assistant-libs/ha-ffmpeg/"; + changelog = "https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 3d8ff39af14b..4b8b02e91209 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iJxu+TdgDHMnLuNTFj0UC8V76x3nAgGqswMLDSgmDmQ="; + hash = "sha256-5SneI1aZiUyLGYmtRXJYPBUtQR08fV+MWkjIQXt208s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 6b93a99a3a27..693f9b27dfb5 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.1"; + version = "2023.2.9"; 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-JNsF8HKat5+yp7Q0l4IKysiJrJ0Q4fEQ+zLAT25hAb0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix deleted file mode 100644 index aa61baa1b489..000000000000 --- a/pkgs/development/python-modules/hangups/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, configargparse -, aiohttp -, async-timeout -, appdirs -, readlike -, requests -, reparser -, protobuf -, urwid -, mechanicalsoup -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "hangups"; - version = "0.4.18"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "tdryer"; - repo = "hangups"; - rev = "v${version}"; - hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<4" "protobuf" \ - --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" - ''; - - propagatedBuildInputs = [ - configargparse - aiohttp - async-timeout - appdirs - readlike - requests - reparser - protobuf - urwid - mechanicalsoup - ]; - - nativeCheckInputs = [ - httpretty - pytestCheckHook - ]; - - pythonImportsCheck = [ - "hangups" - "hangups.client" - "hangups.event" - "hangups.parsers" - "hangups.user" - ]; - - meta = with lib; { - description = "The first third-party instant messaging client for Google Hangouts"; - homepage = "https://github.com/tdryer/hangups"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index b68506ecd352..af74b15b0214 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, hatch , hatchling , packaging , pytestCheckHook @@ -20,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - hatch + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix new file mode 100644 index 000000000000..df7f447a0444 --- /dev/null +++ b/pkgs/development/python-modules/hist/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, boost-histogram +, histoprint +, hatchling +, hatch-vcs +, numpy +, pytestCheckHook +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "hist"; + version = "2.6.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "dede097733d50b273af9f67386e6dcccaab77e900ae702e1a9408a856e217ce9"; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + boost-histogram + histoprint + numpy + ]; + + checkInputs = [ + pytestCheckHook + pytest-mpl + ]; + + meta = with lib; { + description = "Histogramming for analysis powered by boost-histogram"; + homepage = "https://hist.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix new file mode 100644 index 000000000000..3c65fbf0eb80 --- /dev/null +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, click +, numpy +, setuptools +, setuptools-scm +, uhi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "histoprint"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "328f789d186e3bd76882d57b5aad3fa08c7870a856cc83bcdbad9f4aefbda94d"; + }; + + buildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + numpy + uhi + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Pretty print histograms to the console"; + homepage = "https://github.com/scikit-hep/histoprint"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index 58fe5f3e8714..92966821d4bb 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hledger-utils"; - version = "1.12.1"; + version = "1.13.2"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nobodyinperson"; repo = "hledger-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-uAFqBNRET3RaWDTyV53onrBs1fjPR4b5rAvg5lweUN0="; + hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 8f109053b5e9..b60343dfc68a 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.15.3"; + version = "1.15.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ="; + hash = "sha256-StwTN1DmDnNiZ+3iF2NW5qMDFDiwkTZ8tPKzhN6ZrgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 30e147172735..06f7946b1ef2 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.9.2"; + version = "1.9.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4="; + hash = "sha256-7wZocfTYTwTBwm61hKmIS4xlHq2nSvC6p8SlklnHq4M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index c5c199f50539..a3a8cf93b810 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/chip-wheels"; license = licenses.asl20; maintainers = teams.home-assistant.members; - platforms = platforms.linux; + platforms = [ "aarch64-linux" "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 38c25fa1b0c8..a622017bebcf 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, redis }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, redis +}: buildPythonPackage rec { pname = "huey"; - version = "2.4.2"; + version = "2.4.5"; + + format = "pyproject"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; - rev = version; - sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; + rev = "refs/tags/${version}"; + hash = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ redis ]; # connects to redis doCheck = false; meta = with lib; { + changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; description = "A little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 33348ff252c7..13ed586c3787 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/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/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 7a1bd2356d0f..aed8e99e0f84 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -1,20 +1,18 @@ { lib , astor , buildPythonPackage -, colorama , fetchFromGitHub , funcparserlib , hy , pytestCheckHook , python , pythonOlder -, rply , testers }: buildPythonPackage rec { pname = "hy"; - version = "0.25.0"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,14 +21,13 @@ buildPythonPackage rec { owner = "hylang"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-V+ZtPm17ESxCGpRieGvEeO2bkwHfZQ6k9lsnDWr6pqo="; + hash = "sha256-Ow3FAiH97lSaI3oSx702+jgScfNgf+JstuDpgPSB8LM="; }; # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 HY_VERSION = version; propagatedBuildInputs = [ - colorama funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index a02a110bb281..8b16d2927474 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "hylang"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-UvLk5d1lhoXBP2y3YfxVBCoKb3PMHUeNnnbAX6iypiU="; + hash = "sha256-nQAUVX409RWlFPeknnNwFNgo7e2xHkEXkAuXazZNntk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 7b9910559b4d..1f0f799d587f 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for iBeacon BLE devices"; homepage = "https://github.com/Bluetooth-Devices/ibeacon-ble"; + changelog = "https://github.com/Bluetooth-Devices/ibeacon-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index a49f7c684aab..173991f04df6 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -16,6 +16,7 @@ , geoalchemy2 , geopandas , graphviz-nox +, hypothesis , lz4 , multipledispatch , numpy @@ -30,8 +31,9 @@ , pymysql , pyspark , pytest-benchmark -, pytest-randomly , pytest-mock +, pytest-randomly +, pytest-snapshot , pytest-xdist , python , pytz @@ -62,7 +64,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "3.2.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -71,10 +73,12 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = version; - hash = "sha256-YRP1nGJs4btqXQirm0GfEDKNPCVXexVrwQ6sE8JtD2o="; + hash = "sha256-G3kMd6Jyib7ZXHFP6t2CEPlDD5n5zHE2jq/0he3U4Nk="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ atpublic @@ -95,29 +99,31 @@ buildPythonPackage rec { pytestCheckHook click filelock + hypothesis pytest-benchmark pytest-mock pytest-randomly + pytest-snapshot pytest-xdist rsync ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; - preBuild = '' - # setup.py exists only for developer convenience and is automatically generated - # it gets in the way in nixpkgs so we remove it - rm setup.py - ''; - pytestFlagsArray = [ "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" - # this test fails on nixpkgs datafusion version (0.4.0), but works on - # datafusion 0.6.0 - "-k" - "'not datafusion-no_op'" ]; + # remove when sqlalchemy backend no longer uses deprecated methods + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + + # patch out tests that check formatting with black + postPatch = '' + find ibis/tests -type f -name '*.py' -exec sed -i \ + -e '/^ *assert_decompile_roundtrip/d' \ + -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + + ''; + preCheck = '' set -eo pipefail diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 6eb64f79ed32..deff4de058e1 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.1"; + version = "3.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; + hash = "sha256-fPYl9cz9GIDAKZYEH+8g+omRtGMU+abBx16If7H5i3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2d705352d1b3..061b20a835da 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.17"; + version = "2.5.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urviMomTJdbublr2nCj25R/xbs/pEsRKWxmklneTjOQ="; + sha256 = "sha256-Pf9/mjbyC859WT8ZreFq5u6YER/tRgsQuqIgt6mdPqE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 541ddad92e85..da48ed314731 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; + sha256 = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU="; }; nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 93cc6453f978..0450dee30b46 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/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/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index eebeb17bb7e7..97c224a39ac8 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.18.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y="; + hash = "sha256-9NHLrM8RXNxIZpaPZJ8qN3lKXA3gGN6BVqp0VWNQpUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index d281ece24635..496c98488910 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -1,29 +1,43 @@ { lib , aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "incomfort-client"; - version = "0.4.5"; + version = "0.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zxdavb"; repo = pname; - rev = version; - sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp"; + rev = "refs/tags/${version}"; + hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E="; }; propagatedBuildInputs = [ aiohttp ]; - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "incomfortclient" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + ]; + + pythonImportsCheck = [ + "incomfortclient" + ]; meta = with lib; { description = "Python module to poll Intergas boilers via a Lan2RF gateway"; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 2172a8841140..fc5eb2d12ba4 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/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"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-KUBOjeFM4h2Qt9eT0mQKPFYJJ8OWdbYy9+AiHsJWNyU="; + rev = "refs/tags/v${version}"; + hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Inkbird BLE devices"; homepage = "https://github.com/Bluetooth-Devices/inkbird-ble"; + changelog = "https://github.com/Bluetooth-Devices/inkbird-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index a0a37ce92f80..3ea584fbc03d 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # native , poetry-core @@ -18,14 +19,16 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o="; + hash = "sha256-7kq0sZzPeCX7TA5Cl2rg6Uw+9jLz335a+tOrO0+Cyas="; }; nativeBuildInputs = [ @@ -44,10 +47,16 @@ buildPythonPackage rec { pytestCheckHook ]; + + pythonImportsCheck = [ + "inquirer" + ]; + meta = with lib; { - homepage = "https://github.com/magmax/python-inquirer"; description = "A collection of common interactive command line user interfaces, based on Inquirer.js"; + homepage = "https://github.com/magmax/python-inquirer"; + changelog = "https://github.com/magmax/python-inquirer/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 8d6677b046af..4875e94c75f5 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QaWRafp0901vQFMtlmFzkugNsM4PHRll+FUZlEz6E5g="; + hash = "sha256-gS2jDjgAcY4ve80yOPZcZR1v4c9EISYEoJkIezUQilU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index cfef001013c7..3e612c6cda8d 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.12"; + version = "3.10.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FOZNsZK8PTPJhK0BvGQiPqCr8au3rwHsjE3dCKWGtDM="; + hash = "sha256-Rnk0H1ag35HGNeg4oiLOfxB1XLW8yVSOP3qK/1Z009Q="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index d51e41448548..1b0ec627d3c7 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.11.4"; + version = "5.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = "refs/tags/${version}"; - sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; + sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index d65aca693165..a7800b783a88 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "jaconv"; - version = "0.3.1"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikegami-yukino"; repo = pname; - rev = "v${version}"; - hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 0f56965ebd68..8ddb8f4b493c 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/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/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix new file mode 100644 index 000000000000..09a1ff66f263 --- /dev/null +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, absl-py +, cvxpy +, jax +, jaxlib +, matplotlib +, numpy +, optax +, scipy +, scikitlearn +}: + +buildPythonPackage rec { + pname = "jaxopt"; + version = "0.5.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "refs/tags/${pname}-v${version}"; + hash = "sha256-WOsr/Dvguu9/qX6+LMlAKM3EANtYPtDu8Uo2157+bs0="; + }; + + propagatedBuildInputs = [ + absl-py + jax + jaxlib + matplotlib + numpy + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + cvxpy + optax + scikitlearn + ]; + + pythonImportsCheck = [ + "jaxopt" + "jaxopt.implicit_diff" + "jaxopt.linear_solve" + "jaxopt.loss" + "jaxopt.tree_util" + ]; + + meta = with lib; { + homepage = "https://jaxopt.github.io"; + description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 44f88d56d953..ac2a6c8125df 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/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/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index f5d4f12e3073..f6065afa2bc6 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.4.4"; + version = "6.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fy9TNeMdYA32FhOpe38DUvLIJQu9EJLvLWWPdySfifs="; + sha256 = "sha256-a5G3tuinFQU7U22yCaL0sCQp17KNsnNzpWomsL69Ygs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index 465b865d662c..fee502989ba0 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -3,30 +3,39 @@ , fetchFromGitHub , karton-core , unittestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "karton-asciimagic"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; + rev = "refs/tags/v${version}"; + hash = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; }; propagatedBuildInputs = [ karton-core ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; - pythonImportsCheck = [ "karton.asciimagic" ]; + pythonImportsCheck = [ + "karton.asciimagic" + ]; meta = with lib; { description = "Decoders for ascii-encoded executables for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-asciimagic"; + changelog = "https://github.com/CERT-Polska/karton-asciimagic/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index a5d4f2c86a29..7bdac115385f 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; + rev = "refs/tags/v${version}"; + hash = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; }; propagatedBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "AutoIt script ripper for Karton framework"; homepage = "https://github.com/CERT-Polska/karton-autoit-ripper"; + changelog = "https://github.com/CERT-Polska/karton-autoit-ripper/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index 6578dc70a6be..bb59fde71865 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "File type classifier for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-classifier"; + changelog = "https://github.com/CERT-Polska/karton-classifier/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 673d7569463a..bce1025301e3 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; + rev = "refs/tags/v${version}"; + hash = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static configuration extractor for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-config-extractor"; + changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 65c56cbae18c..0c2a44aa3e6b 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -3,18 +3,22 @@ , buildPythonPackage , fetchFromGitHub , unittestCheckHook +, pythonOlder , redis }: buildPythonPackage rec { pname = "karton-core"; - version = "5.0.0"; + version = "5.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M="; + hash = "sha256-TKO0l0AKsC9MMB58ao/EXcJ9k/J3y3S9tc127H7vA6w="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { redis ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "karton.core" @@ -31,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed malware processing framework"; homepage = "https://karton-core.readthedocs.io/"; + changelog = "https://github.com/CERT-Polska/karton/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ chivay fab ]; }; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 621c5da5b6e1..986c7ec27b6a 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web application that allows for Karton task and queue introspection"; homepage = "https://github.com/CERT-Polska/karton-dashboard"; + changelog = "https://github.com/CERT-Polska/karton-dashboard/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 75523b67617f..abc6ab5030cc 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4="; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter"; + changelog = "https://github.com/CERT-Polska/karton-mwdb-reporter/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index ac9c93ee1c4d..f85c756b811e 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -3,18 +3,22 @@ , fetchFromGitHub , karton-core , unittestCheckHook +, pythonOlder , yara-python }: buildPythonPackage rec { pname = "karton-yaramatcher"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + rev = "refs/tags/v${version}"; + hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; }; propagatedBuildInputs = [ @@ -22,13 +26,18 @@ buildPythonPackage rec { yara-python ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; - pythonImportsCheck = [ "karton.yaramatcher" ]; + pythonImportsCheck = [ + "karton.yaramatcher" + ]; meta = with lib; { description = "File and analysis artifacts yara matcher for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-yaramatcher"; + changelog = "https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix index 315054b10de9..e5ddcf01be1c 100644 --- a/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-O5I5shW8nL2RAQptS2Bp/GI/4L6o0xXXmwYvRq0MM8o="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Kegtron BLE devices"; homepage = "https://github.com/Bluetooth-Devices/kegtron-ble"; + changelog = "https://github.com/Bluetooth-Devices/kegtron-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index 6ba2330eb56a..aada84c73654 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "leb128"; - version = "1.0.4"; + version = "1.0.5"; # fetchPypi doesn't include files required for tests src = fetchFromGitHub { owner = "mohanson"; repo = "leb128"; - rev = "v${version}"; - sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zK14LPziBkvXAMzuPbcg/47caO/5GEYA9txAzCGfpS8="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 53ae154857aa..a75bc1f59ab9 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for LED BLE devices"; homepage = "https://github.com/Bluetooth-Devices/led-ble"; + changelog = "https://github.com/Bluetooth-Devices/led-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix deleted file mode 100644 index f6d21f95dbfc..000000000000 --- a/pkgs/development/python-modules/lightning/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, jinja2 -, matplotlib -, numpy -, requests -, six -}: - -buildPythonPackage rec { - version = "1.2.1"; - pname = "lightning-python"; - - src = fetchPypi { - inherit pname version; - sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ]; - - meta = with lib; { - description = "A Python client library for the Lightning data visualization server"; - homepage = "http://lightning-viz.org"; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 428b199294cc..6f07c8854862 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.1.12"; + version = "2023.1.28"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-V3DkIsnVv/HekWuOnIKnMHhccDGWun7mF7AcBSEsy6o="; + hash = "sha256-yIKJAW5hb7EOUiS7G+Q4QAESfG4dbfqHScaQBKLMkeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index c1039db8829c..9fa13391b6ad 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/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/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 01c07c6fecc5..a06101d83757 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -14,11 +14,13 @@ buildPythonPackage rec { pname = "locationsharinglib"; version = "4.1.8"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; + hash = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; }; propagatedBuildInputs = [ @@ -49,11 +51,14 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "locationsharinglib" ]; + pythonImportsCheck = [ + "locationsharinglib" + ]; meta = with lib; { description = "Python package to retrieve coordinates from a Google account"; homepage = "https://locationsharinglib.readthedocs.io/"; + changelog = "https://github.com/costastf/locationsharinglib/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 9f2e31fbc7df..1b064d46b68e 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.5"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; + hash = "sha256-UIfv5lt9Vcyes9VYXkaQyBzfkcRiIE4It7q/CMJc7go="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index ab0edb676f5b..f28b261f5099 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-9dvWm5FnqNkcILeY7qkRESk/iLlNEChs24RniRXtsNM="; + hash = "sha256-uz3IUUL5rdYwUsBNdHB+K/ZaCCnUE5EThFConVl8YgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix new file mode 100644 index 000000000000..59914caf8008 --- /dev/null +++ b/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/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index a8d1c18c471e..193fca714ad5 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.8"; + version = "8.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ="; + hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 44190b11e599..333f55ce4228 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; + format = "flit"; + pythonImportsCheck = [ "mediapy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix new file mode 100644 index 000000000000..021121a44ac2 --- /dev/null +++ b/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/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index f418cfbe9f01..60f2d7329d18 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/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/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index a76d3ff3eff6..66bcc5f3dfa2 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.11"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI="; + hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 104b9a9149ae..c29a75377d8b 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -5,26 +5,28 @@ , fetchPypi , oscrypto , pythonOlder +, six , tqdm , unicrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.3.5"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FjeMtf09I2EksVUwZ2UCndmmqqnyTvtgh58HSrqVShw="; + hash = "sha256-uB3J9DRZ23Hf31EkAUyxNTV7Ftgt0yjhEOiiv+Aft+w="; }; propagatedBuildInputs = [ asn1crypto asysocks oscrypto + six tqdm unicrypto ]; diff --git a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 3cb3e82b0e07..1fa353260dad 100644 --- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/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/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix index 5131fd048603..2e55edd7aedb 100644 --- a/pkgs/development/python-modules/moat-ble/default.nix +++ b/pkgs/development/python-modules/moat-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Moat BLE devices"; homepage = "https://github.com/Bluetooth-Devices/moat-ble"; + changelog = "https://github.com/Bluetooth-Devices/moat-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 2a9fcd201035..7b557940d855 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.15"; + version = "0.6.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-OTnlfJeE64tURR5YrTXjzTHbvGnbeEWu9UHGynzmSiQ="; + hash = "sha256-S+3aIeP63JklGbH2Gc0r8jeThJywQZnJo8alAsPvxhQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 3aa8b02dc101..2cdfd2c0c746 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonAtLeast , subunit , testrepository , testtools @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index b00a7703cf05..336439824140 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/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/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index fdeddeae0601..78aa7eb6e61e 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.12.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9k1lpx5pb9idMwgYAZjVEM915w5wsmLWQ/tnHNSKHAs="; + hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/n3fit/default.nix b/pkgs/development/python-modules/n3fit/default.nix new file mode 100644 index 000000000000..5c8b06b74a65 --- /dev/null +++ b/pkgs/development/python-modules/n3fit/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, hyperopt +, keras +, nnpdf +, psutil +, tensorflow +, validphys2 +}: + +buildPythonPackage rec { + pname = "n3fit"; + version = "4.0"; + format = "setuptools"; + + inherit (nnpdf) src; + + prePatch = '' + cd n3fit + ''; + + postPatch = '' + substituteInPlace src/n3fit/version.py \ + --replace '= __give_git()' '= "'$version'"' + ''; + + propagatedBuildInputs = [ + hyperopt + keras + psutil + tensorflow + validphys2 + ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" + done + ''; + + doCheck = false; # no tests + pythonImportsCheck = [ "n3fit" ]; + + meta = with lib; { + description = "NNPDF fitting framework"; + homepage = "https://docs.nnpdf.science"; + inherit (nnpdf.meta) license; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 385899ba8418..4b656fd72fd0 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -1,37 +1,45 @@ { lib , buildPythonPackage , fetchFromGitHub -, paramiko -, selectors2 , lxml +, paramiko , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "ncclient"; version = "0.6.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; }; propagatedBuildInputs = [ paramiko lxml + six ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "ncclient" ]; + pythonImportsCheck = [ + "ncclient" + ]; meta = with lib; { - homepage = "https://github.com/ncclient/ncclient"; description = "Python library for NETCONF clients"; + homepage = "https://github.com/ncclient/ncclient"; + changelog = "https://github.com/ncclient/ncclient/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 9bf6f3c7817b..3ca143638ca4 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ="; + hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index e9ec686b796c..78fae4877ac9 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.3.2"; + version = "2.3.3"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-ZflCOTqNhalBhxDkee3UwusiVA+ShtfabP0slE28/UQ="; + hash = "sha256-0ZWPoDLlGwLWReOeZc2GgW1FbUufrxTzUndNe5h7Kas="; }; patches = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/nextcord/nextcord/blob/${src.rev}/docs/whats_new.rst"; description = "Python wrapper for the Discord API forked from discord.py"; homepage = "https://github.com/nextcord/nextcord"; license = licenses.mit; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index eed07e4a38db..b9193d138248 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.2.4"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = version; - hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw="; + hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index d5e399701dc8..9f600bdf86ac 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, cython , nose , matplotlib , nibabel @@ -21,9 +22,14 @@ buildPythonPackage rec { sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848"; }; + nativeBuildInputs = [ cython ]; buildInputs = lib.optionals doCheck [ nose ]; propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; + preBuild = '' + make recythonize + ''; + checkPhase = '' # wants to be run in a different directory mkdir nosetests cd nosetests diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9b290730be9d..77ed843d47cd 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/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/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 4f1389a04ab9..28410b313298 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.2"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-QIme76Y7rhPCooazX+pr5ETbAmShVHZ9polJ964NLFg="; + hash = "sha256-SPQ/3ntdD+EBW2YZJKfg2lornlg1ktnvTd1PNAqNSIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 4a1fc5ff3e0d..7ec78dab79e0 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.9.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KhgijXJ908uxM7VZdXo1WU/RGU0cfqctBCbpF2wOcy8="; + sha256 = "sha256-EOkxTliGcGwe0GWfNt9t4gosxrMq7748hcB0Snemtzw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 3c3c43c7ed98..532add5a6a38 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.90.4"; + version = "2.91.0"; 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-alJ0FMh2bZLHG3pUfBJDpnihreSkswQ4BizIMIXKcFc="; + hash = "sha256-sKz++PtqLjgBTf8Y/pYoa/wyuK3OoXOdGyjsbXX0iao="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 51c756db19e3..cd1aad3d6a37 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.2"; + version = "14.0.3"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; + hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix new file mode 100644 index 000000000000..b5be85bf1151 --- /dev/null +++ b/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/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a6f290633edc..e3cd5bb09239 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage +, python3 , bash , cmake -, fetchPypi +, fetchFromGitHub +, gtest , isPy27 , nbval , numpy , protobuf +, pybind11 , pytestCheckHook , six , tabulate , typing-extensions , pythonRelaxDepsHook -, pytest-runner }: -buildPythonPackage rec { +let + gtestStatic = gtest.override { static = true; }; +in 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="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-D8POBAkZVr0O5i4qsSuYRkDfL8WsDTqzgNACmmkFwGs="; }; nativeBuildInputs = [ cmake pythonRelaxDepsHook + pybind11 ]; pythonRelaxDeps = [ "protobuf" ]; @@ -44,26 +51,36 @@ buildPythonPackage rec { nativeCheckInputs = [ nbval pytestCheckHook - pytest-runner tabulate ]; 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 + + substituteInPlace setup.py \ + --replace 'setup_requires.append("pytest-runner")' "" + + # prevent from fetching & building own gtest + substituteInPlace CMakeLists.txt \ + --replace 'include(googletest)' "" + substituteInPlace cmake/unittest.cmake \ + --replace 'googletest)' ')' + ''; + + preConfigure = '' + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 + export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" + '' + lib.optionalString doCheck '' + export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" + export ONNX_BUILD_TESTS=1 ''; preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ''; - disabledTestPaths = [ - # Unexpected output fields from running code: {'stderr'} - "onnx/examples/np_array_tensorproto.ipynb" - ]; - # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin @@ -72,6 +89,35 @@ buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; + doCheck = true; + preCheck = '' + export HOME=$(mktemp -d) + + # detecting source dir as a python package confuses pytest + mv onnx/__init__.py onnx/__init__.py.hidden + ''; + pytestFlagsArray = [ "onnx/test" "onnx/examples" ]; + disabledTests = [ + # attempts to fetch data from web + "test_bvlc_alexnet_cpu" + "test_densenet121_cpu" + "test_inception_v1_cpu" + "test_inception_v2_cpu" + "test_resnet50_cpu" + "test_shufflenet_cpu" + "test_squeezenet_cpu" + "test_vgg19_cpu" + "test_zfnet512_cpu" + ]; + disabledTestPaths = [ + # Unexpected output fields from running code: {'stderr'} + "onnx/examples/np_array_tensorproto.ipynb" + ]; + postCheck = '' + # run "cpp" tests + .setuptools-cmake-build/onnx_gtests + ''; + pythonImportsCheck = [ "onnx" ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index d4cedc80be11..ede1a7a3d84f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/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/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index f514791fd0c7..baa1518244e2 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-z2vVGeMB94S/51bB+Tf47ByvP9BWQ1TzQHpFGS8FR8w="; + hash = "sha256-Nl5dzKZOFudKT5+dKh8iB5cOlG2aXEglSc+l7ALKLJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openvino/default.nix b/pkgs/development/python-modules/openvino/default.nix new file mode 100644 index 000000000000..20f47eb666ef --- /dev/null +++ b/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/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index c921feadd0e8..dc07fcffac26 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -70,10 +70,10 @@ buildPythonPackage rec { typing ]; - configurePhase = if !(pythonOlder "3.5") then '' + configurePhase = lib.optionalString (! pythonOlder "3.5") '' substituteInPlace setup.py \ --replace "'typing'," "" - '' else ""; + ''; checkPhase = '' pytest --ignore tests/test_cli.py \ diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index e373034c2a54..689cd7903368 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.1"; + version = "0.17.5"; 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-Lwrr5XzU2pbx3cYkvYtHgXFhGnz3cMBnNFWCpuY3ltg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index a714cd3a2281..b48a5f23487f 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ="; + sha256 = "sha256-iyF2xXzFSWkrXCAbTJWqV4rnzN+lwPgUxXgY1pptTVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index d981114b7301..7d8443a14b3b 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.0.2"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-5F5zEqpxUooWc2zkUVK+PxrxI/XvYqqB2gRoBVhPzKM="; + hash = "sha256-9qw3r5WRjgXXod19CwVSuosisuQwhi6zNt5ZLSXITyk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index a94c79e9baf6..bb2cfbea90ad 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "sha256-KEUyjQ9H3Ioj/tKoIlPpCs/wqnMdvSTzec+OUObMZro="; + sha256 = "sha256-pIR98yaBwahL0TotunpuydW0SITeYyUhGS9tx1DOCYQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index b45689afb1df..9e80c0a0501a 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -4,25 +4,27 @@ , fetchFromGitHub , jinja2 , matplotlib +, odfpy , openpyxl , pandas , poetry-core -, scipy -, sqlalchemy -, tabulate , pyarrow , pyreadstat -, tables , pytestCheckHook , pythonOlder +, scipy +, sqlalchemy +, tables +, tabulate , types-pytz , typing-extensions , xarray +, XlsxWriter }: buildPythonPackage rec { pname = "pandas-stubs"; - version = "1.5.0.221003"; + version = "1.5.3.230214"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pandas-dev"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-RV0pOTPtlwBmYs3nu8+lNwVpl/VC/VzcXKOQMg9C3qk="; + rev = "refs/tags/v${version}"; + hash = "sha256-hLQXGnWtjYNzzyHO+p7CCFEHc2lrSwh35Om94K5Ozhk="; }; nativeBuildInputs = [ @@ -46,62 +48,65 @@ buildPythonPackage rec { nativeCheckInputs = [ jinja2 matplotlib + odfpy openpyxl - scipy - sqlalchemy - tabulate pyarrow - tables pyreadstat pytestCheckHook + scipy + sqlalchemy + tables + tabulate typing-extensions xarray + XlsxWriter ]; disabledTests = [ # AttributeErrors, missing dependencies, error and warning checks - "test_data_error" - "test_specification_error" - "test_setting_with_copy_error" - "test_setting_with_copy_warning" - "test_numexpr_clobbering_error" - "test_undefined_variable_error" - "test_indexing_error" - "test_pyperclip_exception" - "test_css_warning" - "test_possible_data_loss_error" - "test_closed_file_error" - "test_incompatibility_warning" - "test_attribute_conflict_warning" - "test_database_error" - "test_possible_precision_loss" - "test_value_label_type_mismatch" - "test_invalid_column_name" - "test_categorical_conversion_warning" - "test_join" - "test_isetframe" - "test_reset_index_150_changes" - "test_compare_150_changes" - "test_quantile_150_changes" - "test_resample_150_changes" - "test_index_astype" - "test_orc" - "test_orc_path" - "test_orc_buffer" - "test_orc_columns" - "test_orc_bytes" - "test_clipboard" - "test_clipboard_iterator" - "test_arrow_dtype" - "test_aggregate_series_combinations" "test_aggregate_frame_combinations" - "test_types_rank" - "test_reset_index" - "test_types_assert_series_equal" - "test_show_version" + "test_aggregate_series_combinations" + "test_arrow_dtype" + "test_attribute_conflict_warning" + "test_categorical_conversion_warning" + "test_clipboard_iterator" + "test_clipboard" + "test_closed_file_error" + "test_compare_150_changes" + "test_crosstab_args" + "test_css_warning" + "test_data_error" + "test_database_error" "test_dummies" "test_from_dummies_args" + "test_incompatibility_warning" + "test_index_astype" + "test_indexing_error" + "test_invalid_column_name" + "test_isetframe" + "test_join" + "test_numexpr_clobbering_error" + "test_orc_buffer" + "test_orc_bytes" + "test_orc_columns" + "test_orc_path" + "test_orc" + "test_possible_data_loss_error" + "test_possible_precision_loss" + "test_pyperclip_exception" + "test_quantile_150_changes" + "test_resample_150_changes" + "test_reset_index_150_changes" + "test_reset_index" "test_rolling_step_method" + "test_setting_with_copy_error" + "test_setting_with_copy_warning" + "test_show_version" + "test_specification_error" + "test_types_assert_series_equal" + "test_types_rank" + "test_undefined_variable_error" + "test_value_label_type_mismatch" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; @@ -112,7 +117,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations for Pandas"; - homepage = "https://github.com/VirtusLab/pandas-stubs"; + homepage = "https://github.com/pandas-dev/pandas-stubs"; license = licenses.mit; maintainers = with maintainers; [ malo ]; }; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 9b35cb6ac177..881280a1fca8 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -1,20 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , bleach , bokeh , param , pyviz-comms , markdown , pyct -, testpath +, requests +, setuptools , tqdm -, nodejs +, typing-extensions }: buildPythonPackage rec { pname = "panel"; - version = "0.14.2"; + version = "0.14.3"; format = "wheel"; @@ -23,31 +25,42 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU="; + hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "bokeh" + ]; + propagatedBuildInputs = [ bleach bokeh - param - pyviz-comms markdown + param pyct - testpath + pyviz-comms + requests + setuptools tqdm + typing-extensions + ]; + + pythonImportsCheck = [ + "panel" ]; # infinite recursion in test dependencies (hvplot) doCheck = false; - passthru = { - inherit nodejs; # For convenience - }; - meta = with lib; { description = "A high level dashboarding library for python visualization libraries"; - homepage = "https://pyviz.org"; + homepage = "https://github.com/holoviz/panel"; + changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index e2d94ac02561..c020992bee22 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/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/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 4c5c0744b0e2..4837ffba7c27 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.12"; + version = "0.2.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BdTsx4UIRRK9fbMXOrgut651YMTowxHDFfitlP7ue2I="; + hash = "sha256-Hst/2hRqH8AIKD2EXtJo8m3diOxPBWAmNhtS3TUYT3I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index f23521ea2140..47ef2faea962 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, +{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip, cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: @@ -6,6 +6,17 @@ # it will still use unrar if present in the path let + # FIXME: backport a patch in `file` that seemingly only affects this package + # Revert when fix to main package makes it through staging. + file' = file.overrideAttrs(old: { + patches = (old.patches or []) ++ [ + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691"; + hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ="; + }) + ]; + }); + compression-utilities = [ p7zip gnutar @@ -17,7 +28,7 @@ let gnugrep diffutils bzip2 - file + file' xz ]; in diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index b9f8486aa5d6..61072507e294 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; - rev = "v${version}"; - sha256 = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; + rev = "refs/tags/v${version}"; + hash = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; }; nativeBuildInputs = [ @@ -57,8 +57,9 @@ buildPythonPackage rec { meta = with lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; + changelog = "https://github.com/NordicSemiconductor/pc-ble-driver-py/releases/tag/v${version}"; license = licenses.unfreeRedistributable; - platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index c8813208d5e8..a096973a9367 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/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/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 38e06d362d93..151389fbfd9d 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "11.0.4"; + version = "12.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SU8vsKwZio/5UD2SMhLenfkBjXRuMZCPo2k6+1hx8Y4="; + hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index b1707670e768..55bd8c0cc07d 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pefile"; - version = "2022.5.30"; + version = "2023.2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erocarrera"; repo = pname; - rev = "v${version}"; - hash = "sha256-Cv20hJsErHFSuS5Q1kqLNp4DAsPXv/eFhaU9oYECSeI="; + rev = "refs/tags/v${version}"; + hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files"; homepage = "https://github.com/erocarrera/pefile"; + changelog = "https://github.com/erocarrera/pefile/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ pamplemousse ]; }; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index f9a68d98dc31..8ce8e1fe95f1 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/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/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 89a51051d696..9a98f0515832 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/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.9"; - format = "setuptools"; + version = "7.1.1"; + 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-Obsg5fsTv/7uiFRbzGp90+d90e2dX7CWMMRMgiQvNyc="; + hash = "sha256-u6xfsWHod8U7nM5S40ZU1z4qxNMlWdq+7yhnAtBh8oE="; }; 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/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 186e468e0491..39bdc6ad44ee 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.3.3"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-ivqu9b+4FhGa5y+WnKRk4nF6MR4Vj62pSs2d7ycIZMc="; + hash = "sha256-agjerQTSkrpHCleqNUxg+NFiPnf9u9DQrs3vSR917oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 51f96c24ab58..dca556650321 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.4.0"; + version = "11.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5IHFChiIm/6x3xr+F+RIAZ3kDYQsXs+baFqUasjI8qs="; + hash = "sha256-SGWMLMwNAAi93dw053uiz+4K84v6g/6WD6q0rW00JHw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index e57655c2227c..741b655df868 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -223,5 +223,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/playwright-python"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick yrd SuperSandro2000 ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 338c18967876..0a049c18fed9 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/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/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index f265e24fe4ef..5424152a1e82 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else []; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index ea98a6679275..bfb804911084 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/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/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index ae3b4c551dd4..8bcc74025698 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.2.0"; + version = "23.2.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4GIfXHDY2g6dhvymYzunK2UWxJcO37dXQbI2jxOIwCw="; + hash = "sha256-+oHqBopA2FLrDdxsVQhciW4ZXluZn+z05LmHtyDtFyI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 14c96e5734ab..d3d44259fefb 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "primer3"; - version = "0.6.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "libnano"; repo = "primer3-py"; - rev = version; - sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; }; nativeBuildInputs = [ cython ] diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index e7150093bb42..8c52852b98c6 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/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/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 8dab19a4f818..0ae3cf8bd0d1 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.1.1"; + 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-rT9KkSgIinJxTyJ40Z3VzMh23Ry9O3NFrLH4I2+NFPg="; + hash = "sha256-37JzdhMny6YDTBO9NRzfrZJAVAOPnpcr95fOKxisbTg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 3b454eb2402f..a8d5d243a0a1 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.47"; + version = "3.48"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e2UTTD8J1GDg43FdzU8Xiaj2bL/gHLIT2lzwbwarIyI="; + sha256 = "sha256-igt0niF52at/LERv4+1aVvdU+ZLVvgL2W+l6feuEAO0="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index a862fa69a9a2..a330a9392876 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , python +, pythonAtLeast , pythonOlder , arrow-cpp , cffi @@ -17,18 +18,15 @@ , pkg-config , scipy , setuptools-scm -, six }: let zero_or_one = cond: if cond then 1 else 0; - - _arrow-cpp = arrow-cpp.override { python3 = python; }; in buildPythonPackage rec { pname = "pyarrow"; - inherit (_arrow-cpp) version src; + inherit (arrow-cpp) version src; disabled = pythonOlder "3.7"; @@ -41,13 +39,14 @@ buildPythonPackage rec { setuptools-scm ]; + buildInputs = [ arrow-cpp ]; + propagatedBuildInputs = [ cffi cloudpickle fsspec numpy scipy - six ]; nativeCheckInputs = [ @@ -60,20 +59,24 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = zero_or_one true; - PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; + PYARROW_WITH_FLIGHT = zero_or_one arrow-cpp.enableFlight; PYARROW_WITH_HDFS = zero_or_one true; PYARROW_WITH_PARQUET = zero_or_one true; - PYARROW_WITH_PLASMA = zero_or_one (!stdenv.isDarwin); - PYARROW_WITH_S3 = zero_or_one _arrow-cpp.enableS3; + PYARROW_WITH_PARQUET_ENCRYPTION = zero_or_one true; + # Plasma is deprecated since arrow 10.0.0 + PYARROW_WITH_PLASMA = zero_or_one false; + PYARROW_WITH_S3 = zero_or_one arrow-cpp.enableS3; + PYARROW_WITH_GCS = zero_or_one arrow-cpp.enableGcs; + PYARROW_BUNDLE_ARROW_CPP_HEADERS = zero_or_one false; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" ]; - ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _arrow-cpp; + ARROW_HOME = arrow-cpp; + PARQUET_HOME = arrow-cpp; - ARROW_TEST_DATA = lib.optionalString doCheck _arrow-cpp.ARROW_TEST_DATA; + ARROW_TEST_DATA = lib.optionalString doCheck arrow-cpp.ARROW_TEST_DATA; doCheck = true; @@ -85,6 +88,13 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + postInstall = '' + # copy the pyarrow C++ header files to the appropriate location + pyarrow_include="$out/${python.sitePackages}/pyarrow/include" + mkdir -p "$pyarrow_include/arrow/python" + find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \; + ''; + pytestFlagsArray = [ # Deselect a single test because pyarrow prints a 2-line error message where # only a single line is expected. The additional line of output comes from @@ -102,6 +112,8 @@ buildPythonPackage rec { "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import" # Flaky test, works locally but not on Hydra "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" + # expects arrow-cpp headers to be bundled + "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" @@ -109,8 +121,18 @@ buildPythonPackage rec { "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor" "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client" "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect" + # fails to compile + "--deselect=pyarrow/tests/test_cython.py::test_cython_api" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Repr output is printing number instead of enum name so these tests fail + "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" + ] ++ lib.optionals stdenv.isLinux [ + # this test requires local networking + "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; + disabledTests = [ "GcsFileSystem" ]; + dontUseSetuptoolsCheck = true; preCheck = '' @@ -125,7 +147,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyarrow" - ] ++ map (module: "pyarrow.${module}") ([ + ] ++ map (module: "pyarrow.${module}") [ "compute" "csv" "dataset" @@ -135,9 +157,7 @@ buildPythonPackage rec { "hdfs" "json" "parquet" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "plasma" - ]); + ]; meta = with lib; { description = "A cross-language development platform for in-memory data"; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 8c6086092a71..3981f64645d2 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.19.0"; + version = "2.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; + hash = "sha256-6T2qr0fcHzgDPZvc3StZwIH2ZRvTOJFXDLPc3iFmwCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix index d492923f07ab..11332ecb6f0f 100644 --- a/pkgs/development/python-modules/pydanfossair/default.nix +++ b/pkgs/development/python-modules/pydanfossair/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pydanfossair"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "JonasPed"; repo = "pydanfoss-air"; rev = "v${version}"; - sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b"; + sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 54b4b2ef1d8a..5a4532c598ef 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "106"; + version = "107"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-13of5ohz/hezlmGvSNqCu9QoOPKdPPtrhQHbxmG2/Do="; + hash = "sha256-5NR+N2UoWvzD/y1kP08qOS2djMsLIwLDuaIBmt0AV/s="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library wrapping the Deconz REST API"; homepage = "https://github.com/Kane610/deconz"; + changelog = "https://github.com/Kane610/deconz/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index ef5339086f63..aefb4cc43f54 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/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/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index ab7457a13086..d77caf7e4ad0 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/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/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix index 43909e2c130f..a850030274c4 100644 --- a/pkgs/development/python-modules/pyfido/default.nix +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfido"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b"; + sha256 = "sha256-hh2g46GVCkiMHElEP6McY8FdzGNzZV7pgA5DQhodP20="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index f622dccab292..0401fa3d4cbe 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -29,9 +29,15 @@ buildPythonPackage rec { pexpect ]; + nativeBuildInputs = [ + # For cross compilation the doCheck is false and therefor the + # nativeCheckInputs not included. We have to include nose here, since + # setup.py requires nose unconditionally. + nose + ]; + nativeCheckInputs = [ mock - nose pytestCheckHook ] ++ passthru.optional-dependencies.GATTTOOL; diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index d382687e5c27..51c8dae89f0a 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.59"; + version = "0.3.60"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chimpler"; repo = pname; - rev = version; - sha256 = "sha256-0BuDYheURFhtnWIh7Qw4LzZbk5tSqiNejo+08eglIvs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index 9befc34acbb6..8d2d153ebb9c 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyipma"; - version = "3.0.5"; + version = "3.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KyXHNkP/XJlTdVFdP91x3udMquQju8G2VUHLPvZymtk="; + hash = "sha256-BwW8gUFeinZ9Z/v1orJKRTqt2WxVMD+hQj+A3gU1LDI="; }; propagatedBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to retrieve information from Instituto Português do Mar e Atmosfera"; homepage = "https://github.com/dgomes/pyipma"; + changelog = "https://github.com/dgomes/pyipma/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 472bf727edca..892c44b0b3b2 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/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/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix deleted file mode 100644 index 3e12fbdf9794..000000000000 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, black -, toml -, pytestCheckHook -, python-language-server -, isPy3k -}: - -buildPythonPackage rec { - pname = "pyls-black"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "rupert"; - repo = "pyls-black"; - rev = "v${version}"; - sha256 = "0bkhfnlik89j3yamr20br4wm8975f20v33wabi2nyxvj10whr5dj"; - }; - - disabled = !isPy3k; - - nativeCheckInputs = [ pytestCheckHook ]; - - propagatedBuildInputs = [ black toml python-language-server ]; - - meta = with lib; { - homepage = "https://github.com/rupert/pyls-black"; - description = "Black plugin for the Python Language Server"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix deleted file mode 100644 index 8c7db89d3b19..000000000000 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytest-cov, coverage -, fetchpatch -}: - -buildPythonPackage rec { - pname = "pyls-mypy"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "tomv564"; - repo = "pyls-mypy"; - rev = version; - sha256 = "14giyvcrq4w3asm1nyablw70zkakkcsr76chk5a41alxlk4l2alb"; - }; - - # presumably tests don't find typehints ? - doCheck = false; - - disabledTests = [ - "test_parse_line_without_line" - ]; - - preCheck = '' - export HOME=$TEMPDIR - ''; - - patches = [ - # makes future optional - (fetchpatch { - url = "https://github.com/tomv564/pyls-mypy/commit/2949582ff5f39b1de51eacc92de6cfacf1b5ab75.patch"; - sha256 = "0bqkvdy5mxyi46nhq5ryynf465f68b6ffy84hmhxrigkapz085g5"; - }) - ]; - - nativeCheckInputs = [ mock pytest-cov coverage pytestCheckHook ]; - - propagatedBuildInputs = [ - mypy python-language-server configparser - ] ++ lib.optionals (isPy27) [ - future - ]; - - meta = with lib; { - homepage = "https://github.com/tomv564/pyls-mypy"; - description = "Mypy plugin for the Python Language Server"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index ab6e1e2c6657..eb6fbe371b64 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/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/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index cf69c2b0fa33..68925fe7f4a9 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/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/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a6e3f5eb9a74..e9cf439d36c1 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.1.2"; + version = "3.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s="; + hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 97b3f2c5be59..1be7a78c44f3 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "echoromeo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YbQfdOLO1gs7+oiwe4rDmmD1o7MG+vma5xPlrtNZ00M="; + hash = "sha256-T86d3HGu6hsc54+ocCbINsInH/qHL9+HhOXDQ0I8QGA="; }; # Project has no tests @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; homepage = "https://github.com/echoromeo/pynobo"; + changelog = "https://github.com/echoromeo/pynobo/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch new file mode 100644 index 000000000000..48727de2516a --- /dev/null +++ b/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch @@ -0,0 +1,17 @@ +diff --git a/pynvml/nvml.py b/pynvml/nvml.py +index 56d908f..1de0b97 100644 +--- a/pynvml/nvml.py ++++ b/pynvml/nvml.py +@@ -1475,7 +1475,11 @@ def _LoadNvmlLibrary(): + nvmlLib = CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll")) + else: + # assume linux +- nvmlLib = CDLL("libnvidia-ml.so.1") ++ try: ++ nvmlLib = CDLL("libnvidia-ml.so.1") ++ except OSError: ++ # assume NixOS ++ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1") + except OSError as ose: + _nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND) + if (nvmlLib == None): diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 63d445e0923f..bad74b2aed9c 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, substituteAll , pythonOlder , cudatoolkit +, addOpenGLRunpath }: buildPythonPackage rec { pname = "pynvml"; - version = "11.4.1"; + version = "11.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd"; + sha256 = "sha256-0CeyG5WxCIufwngRf59ht8Z/jjOnh+n4P3NfD3GsMtA="; }; + patches = [ + (substituteAll { + src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + inherit (addOpenGLRunpath) driverLink; + }) + ]; + propagatedBuildInputs = [ cudatoolkit ]; doCheck = false; # no tests in PyPi dist diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 5b8656bbe19f..d3e7faf03cd3 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/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/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 49f4b06a5ce6..05b8793c73fb 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aresponses -, asynctest , backoff , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.01.0"; + version = "2023.02.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,9 +23,18 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qPLfah35E0vX2tQhGw4wTSMyE4nIyWMDIaKlJePVSd4="; + hash = "sha256-EiTTck6hmOGSQ7LyZsbhnH1zgkH8GccejLdJaH2m0F8="; }; + patches = [ + # Remove asynctest, https://github.com/bachya/pyopenuv/pull/108 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch"; + hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -37,7 +46,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytest-aiohttp pytestCheckHook @@ -55,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API to retrieve data from openuv.io"; homepage = "https://github.com/bachya/pyopenuv"; + changelog = "https://github.com/bachya/pyopenuv/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix new file mode 100644 index 000000000000..bbf388c56cad --- /dev/null +++ b/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/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix similarity index 60% rename from pkgs/development/python-modules/pyflunearyou/default.nix rename to pkgs/development/python-modules/pyoutbreaksnearme/default.nix index ea59fa0dc10f..ff2a4a4323c1 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, aiocache , buildPythonPackage , fetchFromGitHub , poetry-core @@ -9,37 +8,29 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder -, msgpack , ujson }: buildPythonPackage rec { - pname = "pyflunearyou"; - version = "2021.10.0"; + pname = "pyoutbreaksnearme"; + version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - aiocache - msgpack ujson ]; @@ -56,12 +47,13 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ - "pyflunearyou" + "pyoutbreaksnearme" ]; meta = with lib; { - description = "Python library for retrieving UV-related information from Flu Near You"; - homepage = "https://github.com/bachya/pyflunearyou"; + description = "Library for retrieving data from for Outbreaks Near Me"; + homepage = "https://github.com/bachya/pyoutbreaksnearme"; + changelog = "https://github.com/bachya/pyoutbreaksnearme/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 49e6abffd54a..5cf5dd791033 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.7.3"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg="; + hash = "sha256-I115lMEg/baWuUZThfisNYSck/QdiYecjhhRqgSkLB8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 327e3a92adac..9b337bf274c2 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/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/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 899e1cfd7b60..8d9c546213f8 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/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/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 02c69a461520..9e8fd5f78922 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -47,6 +48,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; + disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [ + # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. + # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 + "test_calculate_rotation_angle" + "test_region" + ]; + # Disable automatic update of the astropy-helper module postPatch = '' substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 389dff30ad10..a3bbd94663c2 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-ntnZITj8upzUzlrSTjQxY9xNTU+gJ2rE9PN35cpWwvM="; + hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index b143a6c40fd2..464a2cfcc750 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.97"; + version = "2.0.99"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; + hash = "sha256-QQFRDLB+gf5jzCf8imHwkSgOkAyLWJF3UDStnpq6+04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index b232a0bd8f41..908fb0c8a0ae 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.4"; + version = "0.7.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A="; + hash = "sha256-Husvo+JUM1ffCpN6cAxbZ2GyqlKEQArtRiBkcP5cC+U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 9d6a3c640798..be281be33c4e 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,4 +1,6 @@ { python +, pythonAtLeast +, disabledIf , fetchurl , lib , stdenv @@ -9,6 +11,10 @@ , shiboken2 }: +# Only build when Python<=3.10 +# See https://bugreports.qt.io/browse/PYSIDE-1864 +# "There are no plans to support Python versions > 3.10 in the 5.15 branch." +disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; version = "5.15.5"; @@ -49,6 +55,7 @@ stdenv.mkDerivation rec { qtcharts qtsensors qtsvg + qt3d ]) ++ (with python.pkgs; [ setuptools ]) ++ (lib.optionals (python.pythonOlder "3.9") [ @@ -73,4 +80,4 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix index 71fdfa28057b..3b1c8fe2b299 100644 --- a/pkgs/development/python-modules/pysnmplib/default.nix +++ b/pkgs/development/python-modules/pysnmplib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysnmplib"; - version = "5.0.20"; + version = "5.0.21"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-SrtOn9zETtobT6nMVHLi6hP7VZGBvXvFzoThTi3ITag="; + hash = "sha256-ejRIlRxDbdZgy7wHilSzunRTGn1uO6YLLmLxNrrHKss="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix new file mode 100644 index 000000000000..07461e06a298 --- /dev/null +++ b/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/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix new file mode 100644 index 000000000000..1a8ee768fb65 --- /dev/null +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# propagates +, pycryptodome +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "pytapo"; + version = "2.9.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo="; + }; + + propagatedBuildInputs = [ + pycryptodome + requests + urllib3 + ]; + + pythonImportsCheck = [ + "pytapo" + ]; + + # Tests require actual hardware + doCheck = false; + + meta = with lib; { + description = "Python library for communication with Tapo Cameras "; + homepage = "https://github.com/JurajNyiri/pytapo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 0f3cd981ba94..17d63fcc6675 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.11"; + version = "1.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-GSEMjgG8Q+gzHQWRbXr/qiGP6U6ydPxu0JsD56mRNWU="; + hash = "sha256-vuwD9NVomxwG1IQioy6TzEHnibCdpg+VyCXjnjnmw54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 1c69f426b169..feae84901304 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -37,6 +37,12 @@ buildPythonPackage rec { toml ]; + __darwinAllowLocalNetworking = true; + + disabledTests = [ + "test_wait_raise_assertion_false" # racy + ]; + pythonImportsCheck = [ "pytest_httpserver" ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index a0e9bb1fb2a6..c6e8b7e915d6 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, packaging +, pytest +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.3"; + version = "11.0"; + format = "pyproject"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY="; + hash = "sha256-zuWeTm8Nc65j+6CZhlMUupuRW3GTSVQREPoBL/tu+xM="; }; + nativeBuildInputs = [ setuptools ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ packaging ]; - nativeCheckInputs = [ mock pytest ]; - - checkPhase = '' - py.test test_pytest_rerunfailures.py - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pytest plugin to re-run tests to eliminate flaky failures"; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 7fabc513e9b1..18e841f85e1d 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/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/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index f48bc9c13ea7..2e811525c379 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/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/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 5210bc79e72d..4310b767aade 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/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/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 9ee03dc8911c..68bcd7434d05 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY="; + sha256 = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 0214a6b0d2e4..193717d6d83e 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7RawbJ5O5KCruD499fOkuFcouBzp3f7aEUnE37wJqmM="; + sha256 = "sha256-yYmzZuwZSasN6g6Bosivexe5oOy3dP+l/cD5TkXC87g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 36cf7d737a5d..e348b2b80b0e 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9zCUYB+TYgDMoTHpR0u42Usq2EKp8vtzlTgU82eXxl8="; + sha256 = "sha256-vp2r842f9A2lEFLhUcHyGZavAWT4Ke9mH+FAlGucdqo="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; homepage = "https://python-kasa.readthedocs.io/"; + changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 725849fee078..358a647d52d9 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , substituteAll , file , pytestCheckHook @@ -23,6 +24,11 @@ buildPythonPackage rec { src = ./libmagic-path.patch; libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + (fetchpatch { + name = "update-test-for-upstream-added-gzip-extensions.patch"; + url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; + hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; + }) ]; preCheck = '' diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index d7dfee08633a..e59781180b38 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-9Lb5Q54hPdyqMjrHvwBzVXPk8uKBLNRUl2Bljo64Fpo="; + hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8c43d7a4ca27..ade6acd85d46 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.11"; + version = "1.1.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "034vc2j54dciiq80k7jn6kx4g7i58sjk0ykma039k5rihj2rblpk"; + sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A="; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 5a5ac9f772a6..ac69e15ec77d 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , loguru @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.4.5"; + version = "3.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O/+jvdzzxUFaQdAfUM9p40fPPDNN+stTauCD993HH6Y="; + hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw="; }; postPatch = '' @@ -47,6 +48,11 @@ buildPythonPackage rec { "_python_utils_tests" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Flaky tests on darwin + "test_timeout_generator" + ]; + meta = with lib; { description = "Module with some convenient utilities"; homepage = "https://github.com/WoLpH/python-utils"; diff --git a/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch new file mode 100644 index 000000000000..11b554151790 --- /dev/null +++ b/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/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index 7ad125b26ef5..178b1899ef51 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/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/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 58b3ea9f2ec9..83ab0a9879f3 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/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/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index e162a4a6cb61..b8594e51f839 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.7"; + version = "2022.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo="; + hash = "sha256-AaBoHEuWhKKDBGFeulXRqzGuAL9o7BV+w3CKgYLbvNA="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 3a6c3871a441..e6391349927c 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/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/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 58523a13b066..4d56399d1491 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.36"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KV/fkgYUt8hfpGxDO3CNNrC91BaI9W8T2mr2H4eJdxo="; + hash = "sha256-9Cv0Quh0uN/DxOG1J2QCFb8fqRJTyovixmU8X721t8o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 97d2b5a83ba6..b238d82ec98d 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/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/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index bd5b31869cba..d4b3d70b72a9 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM="; + hash = "sha256-2jNf/jmqpAE4GoX7xGvQTr0MF/UalIWDMAQHUq+B4v4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index ce69f6c6c075..ec6bdb5d4f87 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , imageio , numpy , pillow , pooch , scooby , vtk -, unittestCheckHook }: buildPythonPackage rec { pname = "pyvista"; - version = "0.37.0"; + version = "0.38.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-02osbV9T9HOrapJBZpaTrO56UXk5Tcl1ldoUzB3iMUE="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-wyzS/51IXsSuyLIWFVUK4sgtHrppL5Hp52H6aWTcN+c="; }; propagatedBuildInputs = [ @@ -28,8 +30,11 @@ buildPythonPackage rec { vtk ]; - nativeCheckInputs = [ - unittestCheckHook + # Fatal Python error: Aborted + doCheck = false; + + pythonImportsCheck = [ + "pyvista" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 54ee52c347bf..a2ce4e068688 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/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/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 634db03a3a22..64798acad2ee 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , astropy , pillow , pythonOlder @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; }; + patches = [ + # Backport Python 3.11 support. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; + sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; + }) + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index b1384496325b..c03a4d01b170 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.8"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "briis"; repo = pname; - rev = "v${version}"; - sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; + rev = "refs/tags/v${version}"; + hash = "sha256-LFA1GJCYFIWl7/YblRrYgAB4lbELpzhCJyjB8aCkJ/E="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get data from WeatherFlow Weather Stations"; homepage = "https://github.com/briis/pyweatherflowrest"; + changelog = "https://github.com/briis/pyweatherflowrest/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index 21053b8c75bc..8140226b4dd9 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-vfezalq3x9KAMtwixUkIVQIwBO2zd+BDl+JwdRqBn7w="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Qingping BLE devices"; homepage = "https://github.com/bluetooth-devices/qingping-ble"; + changelog = "https://github.com/Bluetooth-Devices/qingping-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index 38ff4bc434ff..b05a0428f976 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "quantiphy"; - version = "2.18"; + version = "2.19"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "quantiphy"; rev = "v${version}"; - hash = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q="; + hash = "sha256-oSWq/D1EX6mxUDElfujyOSEtql0csAm72u2B5RuQddE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index da4a3846a95f..6a223bb4fb76 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -1,12 +1,18 @@ { lib +, aiohttp +, aioresponses , beautifulsoup4 , buildPythonPackage , fetchFromGitHub , html5lib +, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder , requests , requests-mock +, setuptools +, setuptools-scm , urllib3 }: @@ -24,7 +30,25 @@ buildPythonPackage rec { hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + # https://github.com/vanstinator/raincloudy/pull/60 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" \ + + # fix raincloudy.aio package discovery, by relying on + # autodiscovery instead. + sed -i '/packages=/d' setup.py + ''; + propagatedBuildInputs = [ + aiohttp requests beautifulsoup4 urllib3 @@ -32,19 +56,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp pytestCheckHook requests-mock ]; - postPatch = '' - # https://github.com/vanstinator/raincloudy/pull/60 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "html5lib==1.0.1" "html5lib" - ''; - pythonImportsCheck = [ "raincloudy" + "raincloudy.aio" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/rapt-ble/default.nix b/pkgs/development/python-modules/rapt-ble/default.nix new file mode 100644 index 000000000000..7c4f104c8cde --- /dev/null +++ b/pkgs/development/python-modules/rapt-ble/default.nix @@ -0,0 +1,58 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "rapt-ble"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "sairon"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-upTtVqxVHrqLSGTSGCiCVlDa2NEuuqe+0W2DM+UhTnc="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=rapt_ble --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rapt_ble" + ]; + + meta = with lib; { + description = "Library for RAPT Pill hydrometer BLE devices"; + homepage = "https://github.com/sairon/rapt-ble"; + changelog = "https://github.com/sairon/rapt-ble/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 92e5c680b730..a2c004fba7b8 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , poetry-core @@ -18,7 +17,7 @@ buildPythonPackage rec { version = "2022.11.2"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix new file mode 100644 index 000000000000..5a79b68e6b85 --- /dev/null +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tabulate +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage { + pname = "remotezip"; + version = "0.12.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gtsystem"; + repo = "python-remotezip"; + # upstream does not tag releases, determined with git blame + # pypi archive lacks files for tests + rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; + hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + }; + + propagatedBuildInputs = [ + requests + tabulate + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + requests-mock + ]; + + pythonImportsCheck = [ + "remotezip" + ]; + + meta = with lib; { + description = "Python module to access single members of a zip archive without downloading the full content"; + homepage = "https://github.com/gtsystem/python-remotezip"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 321b3daec198..1a9c2b509fbb 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.11"; + version = "0.1.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; + rev = "refs/tags/v${version}"; + hash = "sha256-uSyqAs0JqrsFuMpfuILoIGxLL+HVOGI/euCZziCgEdQ="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the Renault API"; homepage = "https://github.com/hacf-fr/renault-api"; + changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 2215ac0c28e9..5f3a22c3a1e0 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.3.2"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-lLq+tmsyySpTO99ecH/uGK9b7/BJFbz5U2fSO/IrPGo="; + hash = "sha256-7XD8nmuja8BL66OCdflKWiKyR47TRXUjJLSmcgqSl8g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index d67f8f364ea2..b240aa81509c 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/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/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index fcc4db1fbf0f..96b64a5be236 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.14"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-LZgKjSas0KdJAf4leSVz8sEnRrlJ20Sm9Ka+S5zDOTM="; + hash = "sha256-xk8+oERonZWzxKEmZutfvovzVOz9ZP5O83cMDTz9i3Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index a751ef1d4c0e..8c02dd5393ed 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/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/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix new file mode 100644 index 000000000000..52dce6a15090 --- /dev/null +++ b/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/pkgs/development/python-modules/riscof/make_writeable.patch b/pkgs/development/python-modules/riscof/make_writeable.patch new file mode 100644 index 000000000000..938f9913a7ad --- /dev/null +++ b/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/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix new file mode 100644 index 000000000000..fdfd6741f6e2 --- /dev/null +++ b/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/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix new file mode 100644 index 000000000000..98fff40285b2 --- /dev/null +++ b/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/pkgs/development/python-modules/rmsd/default.nix b/pkgs/development/python-modules/rmsd/default.nix new file mode 100644 index 000000000000..2a0f2ecb50b2 --- /dev/null +++ b/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/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 7383946dcb16..453a6e8e953f 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.7"; + version = "0.4.9"; 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-6hv85lWr2/qRzLrER6IYdmcvgiPKi1tt4fQaiqGwFQY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 74810c7761f5..df1201fb8ea6 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/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/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix index aaf958d26922..43f6e0bbb95e 100644 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/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/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index dd27a7ca110d..206c38cda762 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.7"; + version = "3.5.8"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-h6QJA3m0/DTn86Q0cXMJBndsNzmIhwhqgDV9ZP3QZUs="; + sha256 = "sha256-ImEfIbxSeYCH+5gwlwXxolz76L/Sf7/u6gHz01L92yk="; }; patches = [ diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index c095ea9ca921..008813330dc8 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/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/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 93dc48affc82..38fffa4ba88f 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/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/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7f9091d87f14..13bc07faed3a 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { runHook postCheck ''; + requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time + passthru = { blas = numpy.blas; }; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 0f2ffa7138e6..c2129a38bc79 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -11,11 +11,12 @@ , pygtrie , pythonOlder , setuptools +, shortuuid }: buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.7"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F+t/3Nfcw+LG9Kh0Je2JwPWUWBNsZXTEaQOKaTT5ig0="; + hash = "sha256-WXePQMHCAmcGUHNNHBaqNQisewMUR87iJC0K2ltYVBE="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { pathspec pygit2 pygtrie + shortuuid ]; # Requires a running Docker instance diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 9be77facf08e..290637cb8abb 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/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/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 646db47538bb..62756a4eab2c 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/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/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix new file mode 100644 index 000000000000..f21e09d1e581 --- /dev/null +++ b/pkgs/development/python-modules/screed/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, bz2file +, setuptools +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "screed"; + version = "1.1.1"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-EB4ZNImNLUoU+dnJd3S4wTyQpmuNK3NLtakPsO1iCbU="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonImportsCheck = [ "screed" ]; + checkInputs = [ pytestCheckHook ]; + + # These tests use the screed CLI and make assumptions on how screed is + # installed that break with nix. Can be enabled when upstream is fixed. + disabledTests = [ + "Test_convert_shell" + "Test_fa_shell_command" + "Test_fq_shell_command" + ]; + + propagatedBuildInputs = [ bz2file setuptools ]; + + meta = with lib; { + description = "A simple read-only sequence database, designed for short reads"; + homepage = "https://pypi.org/project/screed/"; + maintainers = with maintainers; [ luizirber ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 4e0513985a85..cd33595b22f2 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/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/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 76c3956ec86b..598bbc41deee 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-7inmi8dHi6So+8AbLq85Go/GEaiV1XK/7+wt9UkTdo8="; + hash = "sha256-YTi6SNtTWuEPlQ3PTeis9osvtnWmZ7SRQbne9fefdco="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 3e9793d0974e..4c8412e7f936 100644 --- a/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/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"; @@ -19,10 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE="; + rev = "refs/tags/v${version}"; + hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -37,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "sensorpro_ble" ]; diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 3567b178bb95..d51f6d7d6447 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/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/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix new file mode 100644 index 000000000000..4554b36d1207 --- /dev/null +++ b/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/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index e01c1828fe60..d81b055036c9 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-2STQKIAoaGLreGGkqOSrNrByu7j+7oxZihwp9COhuGM="; + hash = "sha256-xUDMi2xoRMsDDe7LcQxIxxozo8vV5ZPzZp5zmNld3ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 208e8b13a427..fce03188f85d 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/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/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 34ad5aa93908..fda1e1896a50 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; + changelog = "https://github.com/skorokithakis/shortuuid/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ zagy ]; }; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 28e5c2578602..57693fb3791c 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "simpleeval"; - version = "0.9.12"; + version = "0.9.13"; format = "pyproject"; src = fetchFromGitHub { owner = "danthedeckie"; repo = pname; - rev = version; - sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4"; + rev = "refs/tags/${version}"; + hash = "sha256-I1GILYPE6OyotgRe0Ek/iHHv6q9/b/MlcTxMAtfZD80="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, safe single expression evaluator library"; homepage = "https://github.com/danthedeckie/simpleeval"; + changelog = "https://github.com/danthedeckie/simpleeval/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ johbo ]; }; diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index ac6ca9c21264..74c7a3c0addf 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , backoff , beautifulsoup4 , buildPythonPackage @@ -23,7 +22,7 @@ buildPythonPackage rec { version = "2022.12.1"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; @@ -48,18 +47,12 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook types-pytz ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = "<0.18"' 'docutils = "*"' - ''; - disabledTests = [ # simplipy/api.py:253: InvalidCredentialsError "test_request_error_failed_retry" diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 22901130ccd8..7114b7b16716 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.19.5"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; + hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f0299b231b06..4a89534c63cd 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.9.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; + hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 94a4a2a14a52..1764f561169a 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.5"; + version = "1.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-clUDElZ17xxbrJ+O0oplzVAxL1afWDwdk/g5ZofEhOs="; + hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 48a69786855b..01128c77a5d2 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.29.0"; + version = "0.29.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc="; + hash = "sha256-Kp9rG7fJzvmnLpjVulf9kODoABdjaaHvgyed9I+FHVA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index af8724d1999d..b20c60c4ab82 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/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/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 4bbf606ff523..91b4e2ec7a42 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/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/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 4fd3594b8826..43e9ab052d55 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -27,6 +27,11 @@ , typer , typing-extensions , wasabi +, writeScript +, stdenv +, nix +, git +, nix-update }: buildPythonPackage rec { @@ -85,7 +90,19 @@ buildPythonPackage rec { "spacy" ]; - passthru.tests.annotation = callPackage ./annotation-test { }; + passthru = { + updateScript = writeScript "update-spacy" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} + + nix-update python3Packages.spacy + + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + ''; + tests.annotation = callPackage ./annotation-test { }; + }; meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP)"; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index d29b7ac7fa87..e44e2300763d 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,374 +1,374 @@ [ { "pname": "ca_core_news_lg", - "version": "3.3.0", - "sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l", + "version": "3.5.0", + "sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.3.0", - "sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn", + "version": "3.5.0", + "sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.3.0", - "sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6", + "version": "3.5.0", + "sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.3.0", - "sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw", + "version": "3.5.0", + "sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.3.0", - "sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr", + "version": "3.5.0", + "sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.3.0", - "sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d", + "version": "3.5.0", + "sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.3.0", - "sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy", + "version": "3.5.0", + "sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.3.0", - "sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f", + "version": "3.5.0", + "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.3.0", - "sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in", + "version": "3.5.0", + "sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.3.0", - "sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d", + "version": "3.5.0", + "sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.3.0", - "sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7", + "version": "3.5.0", + "sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.3.0", - "sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda", + "version": "3.5.0", + "sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.3.0", - "sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b", + "version": "3.5.0", + "sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.3.0", - "sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v", + "version": "3.5.0", + "sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.3.0", - "sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3", + "version": "3.5.0", + "sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.3.0", - "sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl", + "version": "3.5.0", + "sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.3.0", - "sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il", + "version": "3.5.0", + "sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.3.0", - "sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw", + "version": "3.5.0", + "sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.3.0", - "sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9", + "version": "3.5.0", + "sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.3.0", - "sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc", + "version": "3.5.0", + "sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.3.0", - "sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14", + "version": "3.5.0", + "sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.3.0", - "sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd", + "version": "3.5.0", + "sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12", "license": "gpl3" }, { "pname": "fr_core_news_lg", - "version": "3.3.0", - "sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j", + "version": "3.5.0", + "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.3.0", - "sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav", + "version": "3.5.0", + "sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.3.0", - "sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz", + "version": "3.5.0", + "sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.3.0", - "sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3", + "version": "3.5.0", + "sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2", "license": "lgpllr" }, { "pname": "it_core_news_lg", - "version": "3.3.0", - "sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1", + "version": "3.5.0", + "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.3.0", - "sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1", + "version": "3.5.0", + "sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.3.0", - "sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h", + "version": "3.5.0", + "sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip", "license": "cc-by-nc-sa-30" }, { "pname": "lt_core_news_lg", - "version": "3.3.0", - "sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85", + "version": "3.5.0", + "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.3.0", - "sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q", + "version": "3.5.0", + "sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.3.0", - "sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy", + "version": "3.5.0", + "sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.3.0", - "sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl", + "version": "3.5.0", + "sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.3.0", - "sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky", + "version": "3.5.0", + "sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.3.0", - "sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5", + "version": "3.5.0", + "sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.3.0", - "sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0", + "version": "3.5.0", + "sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.3.0", - "sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss", + "version": "3.5.0", + "sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.3.0", - "sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5", + "version": "3.5.0", + "sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.3.0", - "sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0", + "version": "3.5.0", + "sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.3.0", - "sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc", + "version": "3.5.0", + "sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.3.0", - "sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1", + "version": "3.5.0", + "sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.3.0", - "sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq", + "version": "3.5.0", + "sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.3.0", - "sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1", + "version": "3.5.0", + "sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.3.0", - "sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s", + "version": "3.5.0", + "sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.3.0", - "sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0", + "version": "3.5.0", + "sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.3.0", - "sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824", + "version": "3.5.0", + "sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.3.0", - "sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl", + "version": "3.5.0", + "sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.3.0", - "sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g", + "version": "3.5.0", + "sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.3.0", - "sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72", + "version": "3.5.0", + "sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.3.0", - "sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm", + "version": "3.5.0", + "sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.3.0", - "sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq", + "version": "3.5.0", + "sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.3.0", - "sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp", + "version": "3.5.0", + "sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.3.0", - "sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0", + "version": "3.5.0", + "sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn", "license": "mit" }, { "pname": "sv_core_news_lg", - "version": "3.3.0", - "sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx", + "version": "3.5.0", + "sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.3.0", - "sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab", + "version": "3.5.0", + "sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.3.0", - "sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7", + "version": "3.5.0", + "sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "3.3.0", - "sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz", + "version": "3.5.0", + "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.3.0", - "sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx", + "version": "3.5.0", + "sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.3.0", - "sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc", + "version": "3.5.0", + "sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.3.0", - "sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q", + "version": "3.5.0", + "sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.3.0", - "sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v", + "version": "3.5.0", + "sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.3.0", - "sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc", + "version": "3.5.0", + "sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb", "license": "mit" } ] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 0e0f1f19640f..4110e157d62b 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -6,42 +6,72 @@ , sentencepiece , spacy , spacy-pkuseg -, spacy-transformers }: +, spacy-transformers +, writeScript +, stdenv +, jq +, nix +, moreutils +}: let buildModelPackage = { pname, version, sha256, license }: - let - lang = builtins.substring 0 2 pname; - in buildPythonPackage { - inherit pname version; + let + lang = builtins.substring 0 2 pname; + in + buildPythonPackage { + inherit pname version; - src = fetchurl { - url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - inherit sha256; + src = fetchurl { + url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + propagatedBuildInputs = [ spacy ] + ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] + ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] + ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + + postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' + substituteInPlace meta.json \ + --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + ''; + + pythonImportsCheck = [ pname ]; + + passthru.updateScript = writeScript "update-spacy-models" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ jq nix moreutils ]} + + IFS=. read -r major minor patch <<<"${spacy.version}" + spacyVersion="$(echo "$major.$minor.0")" + + pushd pkgs/development/python-modules/spacy/ || exit + + jq -r '.[] | .pname' models.json | while IFS= read -r pname; do + if [ "$(jq --arg pname "$pname" -r '.[] | select(.pname == $pname) | .version' models.json)" == "$spacyVersion" ]; then + continue + fi + + newHash="$(nix-prefetch-url "https://github.com/explosion/spacy-models/releases/download/$pname-$spacyVersion/$pname-$spacyVersion.tar.gz")" + jq --arg newHash "$newHash" --arg pname "$pname" --arg spacyVersion "$spacyVersion" \ + '[(.[] | select(.pname != $pname)), (.[] | select(.pname == $pname) | .sha256 = $newHash | .version = $spacyVersion)] | sort_by(.pname)' \ + models.json | sponge models.json + done + + popd || exit + ''; + + meta = with lib; { + description = "Models for the spaCy NLP library"; + homepage = "https://github.com/explosion/spacy-models"; + license = licenses.${license}; + maintainers = with maintainers; [ rvl ]; + }; }; - propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] - ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] - ++ lib.optionals (lang == "ru") [ pymorphy2 ] - ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; - - postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' - substituteInPlace meta.json \ - --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" - ''; - - pythonImportsCheck = [ pname ]; - - meta = with lib; { - description = "Models for the spaCy NLP library"; - homepage = "https://github.com/explosion/spacy-models"; - license = licenses.${license}; - maintainers = with maintainers; [ rvl ]; - }; - }; - makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); -in makeModelSet (lib.importJSON ./models.json) - -# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url +in +makeModelSet (lib.importJSON ./models.json) diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix new file mode 100644 index 000000000000..795556797b93 --- /dev/null +++ b/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/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 05dfba949729..3d12618b8e45 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -5,10 +5,11 @@ , pytestCheckHook , python-dateutil , duckdb +, pyspark }: buildPythonPackage rec { pname = "sqlglot"; - version = "6.0.7"; + version = "10.5.2"; disabled = pythonOlder "3.8"; @@ -16,12 +17,15 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "v${version}"; - hash = "sha256-7PBhf9NN/mCi92xSkB9ygfmfxTyOYaEyrNvL309sG5Y="; + hash = "sha256-ZFc2aOhCTRFlrzgnYDSdIZxRqKZ8FvkYSZRU0OMHI34="; }; propagatedBuildInputs = [ python-dateutil ]; - nativeCheckInputs = [ pytestCheckHook duckdb ]; + nativeCheckInputs = [ pytestCheckHook duckdb pyspark ]; + + # these integration tests assume a running Spark instance + disabledTestPaths = [ "tests/dataframe/integration" ]; pythonImportsCheck = [ "sqlglot" ]; diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 76c1eb22b2dc..da465eb0ccb3 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/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/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index c7e506e3ca20..c65563d6e6a3 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -2,20 +2,24 @@ , buildPythonPackage , fetchPypi , nose +, setuptools , arrow , requests , units +, pint +, pydantic , pytz , six }: buildPythonPackage rec { pname = "stravalib"; - version = "1.1.0"; + version = "1.2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; + sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; nativeCheckInputs = [ @@ -26,7 +30,10 @@ buildPythonPackage rec { arrow requests units + pint + pydantic pytz + setuptools six ]; @@ -36,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; - homepage = "https://github.com/hozn/stravalib"; + homepage = "https://github.com/stravalib/stravalib"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 96a7310cb04c..b5db5c256440 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "5.0.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; + hash = "sha256-wAjdCMWZhtzwWfu3dkhucLgtT6RqY8oQhdlLJojCjhk="; }; 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/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix new file mode 100644 index 000000000000..7b9a8977a928 --- /dev/null +++ b/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/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix new file mode 100644 index 000000000000..d31fb3683ef4 --- /dev/null +++ b/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/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 8082fd9267bc..8cd3231bea07 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -18,7 +18,7 @@ # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, cudaPackages ? {} -, mklSupport ? false, mkl ? null +, mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport @@ -39,8 +39,6 @@ assert cudaSupport -> cudatoolkit != null # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); -assert mklSupport -> mkl != null; - let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; @@ -75,7 +73,7 @@ let tfFeature = x: if x then "1" else "0"; version = "2.11.0"; - variant = if cudaSupport then "-gpu" else ""; + variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; pythonEnv = python.withPackages (_: diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 73b5a5727a38..9e3e1560c208 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck"; }; + # https://github.com/sirfz/tesserocr/issues/314 + postPatch = '' + sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesseract.pxd + ''; + nativeBuildInputs = [ cython pkg-config diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index ee2a4fb2e757..1a07edc441d4 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/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 = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Thermopro BLE devices"; homepage = "https://github.com/bluetooth-devices/thermopro-ble"; + changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index c4164ce07003..1be167f9a88a 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/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/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index e9018c123d46..6e66aa75b068 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -76,7 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 2802ef080eac..46e64ad15fcb 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -9,23 +9,23 @@ version : builtins.getAttr version { "1.13.1" = { x86_64-linux-37 = { name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-INfG4AgEtr6m9pt3JAxPzfJEzOL2sf9zvv98DfZVPZ0="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-bXg6H3mHFyTK2jw3TKUJiGNZqMSseNBT34mxQu6QREA="; }; x86_64-linux-38 = { name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-kzj6oKWg62JeF+OXKfBvsKV0CY16uI2Fa72ky3agtmU="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-u/lUbw0Ni1EmPKR5Y3tCaogzX8oANPQs7GPU0y3uBa8="; }; x86_64-linux-39 = { name = "torch-1.13.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-20V6gi1zYBO2/+UJBTABvJGL3Xj+aJZ7YF9TmEqa+sU="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-s6wTng1KCzA8wW9R63cUbsfRTAsecCrWOGE2KPUIavc="; }; x86_64-linux-310 = { name = "torch-1.13.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-UdWHDN8FtiCLHHOf4LpRG5d+yjf5UHgpZ1WWrMEbbKQ="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU="; }; x86_64-darwin-37 = { name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl"; @@ -62,6 +62,5 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl"; hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU="; }; - }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index c64f36c8df32..f1a8e72a591d 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -111,6 +111,15 @@ in buildPythonPackage rec { # base is 10.12. Until we upgrade, we can fall back on the older # pthread support. ./pthreadpool-disable-gcd.diff + ] ++ [ + # PyTorch fails to build on gcc 12 due to gloo + # https://github.com/pytorch/pytorch/issues/77614 + (fetchpatch { + url = "https://github.com/facebookincubator/gloo/commit/4a5e339b764261d20fc409071dc7a8b8989aa195.patch"; + stripLen = 1; + extraPrefix = "third_party/gloo/"; + hash = "sha256-UxR1r7F6g76BWj3GBIrSy5t+YZDCWy6mMddwx+hon5w="; + }) ]; postPatch = lib.optionalString rocmSupport '' @@ -204,7 +213,11 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ] + # Suppress gcc regression: avx512 math function raises uninitialized variable warning + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593 + # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939 + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=maybe-uninitialized" "-Wno-error=uninitialized" ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 78151ae787a5..47aab0430a06 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" +linux_cuda_version="cu117" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl/cpu" diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index f3656aa0a46f..f840b10e2b87 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index a5ac20de3efa..bbf1e9220b42 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -9,23 +9,23 @@ version : builtins.getAttr version { "0.13.1" = { x86_64-linux-37 = { name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-jrztfOrRCFKVNuXqnyeM3GCRDj/K8DDmW9jNLckCEAs="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-wQJJ2BPkQAGxXx8H0rt3P39wsl/6KhbF27wYHT5L6/o="; }; x86_64-linux-38 = { name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-oESJecUUYoHWYkPa8/+t86rjEj4F4CNpvPpCwZAk5AY="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-QCY7LUVyj7/x2zOBJyvkKXD/blj5KZSqWHKlvUx+cmQ="; }; x86_64-linux-39 = { name = "torchaudio-0.13.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-W8DinLePfEUu608nApxABJdw1RVTv4QLTKLt1j2iie4="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-Zbs2FdQz1bkwrNwQNu+xJAR9VxfbpN63D0GSkNlC+DY="; }; x86_64-linux-310 = { name = "torchaudio-0.13.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-3vRLFxUB3LmU9aGUjVWWYnBXBe475veBvRHvzTu/zTA="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY="; }; x86_64-darwin-37 = { name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 807129f227ea..0807b00142c6 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" +linux_cuda_version="cu117" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl" diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index afa862ab4778..3c7aa4bb6248 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -61,7 +61,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 7a46e5650bf5..282154f89d33 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -9,23 +9,23 @@ version : builtins.getAttr version { "0.14.1" = { x86_64-linux-37 = { name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-SYVxnGbJYS/0uy06U8P6r92TQVKyqHQU0nvceHSkNg8="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4="; }; x86_64-linux-38 = { name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-R1k1helxw+DJgPq/v7iF61/wVHFrqlVWYMWwMEyeo50="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik="; }; x86_64-linux-39 = { name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-qfw4BA4TPRd58TG0SXyu+DDp5pn6+JzTI81YeU/7MFs="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I="; }; x86_64-linux-310 = { name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-/LWNQb+V3YuF04j6GWnR3K1V7sBV4xeYHWU6BcTKbYs="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM="; }; x86_64-darwin-37 = { name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl"; diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 44a9ba8ece5a..fcc8edd0fceb 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" +linux_cuda_version="cu117" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl" diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 1c191cc2991a..d09b5e7824f9 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.18.3"; + version = "3.19.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M="; + sha256 = "sha256-03C6BPjVmsSTsJSIUnhyxonSqvTEc3ZkBw8xQeAIwWw="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index b4440f68d6c5..763fe7999c7f 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.1.20"; + version = "2023.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7T/U4dLqd8qe03k4BYJWbmADpU1wo+VSGpsqeJZgk2I="; + hash = "sha256-O2lg+5bB1MyZiL3BuQvNZfz12YQ9iE38hr1nT/gaTeo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 91b360f936e3..7889a8ab03ee 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests-cache , pytest }: buildPythonPackage rec { pname = "tvdb_api"; - version = "3.1.0"; + version = "3.2.0-beta"; - src = fetchPypi { - inherit pname version; - sha256 = "f63f6db99441bb202368d44aaabc956acc4202b18fc343a66bf724383ee1f563"; + src = fetchFromGitHub { + owner = "dbr"; + repo = "tvdb_api"; + rev = "ce0382181a9e08a5113bfee0fed2c78f8b1e613f"; + sha256 = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8="; }; propagatedBuildInputs = [ requests-cache ]; @@ -26,7 +28,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; - # https://github.com/dbr/tvdb_api/issues/94 - broken = true; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 1f8f402583af..f67448c62632 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.2"; + version = "7.16.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw="; + hash = "sha256-qgsJ/i8gcuirLp8O6XShgdfxdmFyK2H+oWkiP2795rA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 4d9223f7d93a..6200298b3be3 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw="; + hash = "sha256-gGLSR6XESaUUt31njQJtPeTOKSgVJHlS+UdYhPKvQJQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix new file mode 100644 index 000000000000..b0a505e3205b --- /dev/null +++ b/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/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 155b18f02841..0a059b252b52 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.5"; + version = "0.4.15.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PSqJbsfz0fZpz3ruoO9+usRznwLbM6sTKB5qcewvwsU="; + hash = "sha256-2oToq+lcLhGtKyi6VXq45dyAhjvW+HOefBkWyVB1WvQ="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 275fdbaab886..12572eca0c81 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/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.7"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 31906b220af2..33e80f489521 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/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/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix new file mode 100644 index 000000000000..10c79c532098 --- /dev/null +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-pillow"; + version = "9.4.0.12"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "types-Pillow"; + sha256 = "sha256-4AdBSdXwbTWTwRisyD41P4VCvMc1dv/vtlaOqrVnE0g="; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "PIL-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for Pillow"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ arjan-s ]; + }; +} diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 862b8ff805c2..967d08fc0d7a 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.21.0.2"; + version = "4.21.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg="; + sha256 = "sha256-gZp8Z+aUduOcPwyYcbu57oIxNkXTF7ba62CslaMJ29M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index e671b91bb979..81f56cd8040a 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.6"; + version = "2.8.19.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I="; + hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index f0b4056e2b58..25692d5ee8c5 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/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.6"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; + sha256 = "sha256-JOdrk41Y5oZFJx7rFJr2Ai0dqZeI5IH5Wb0oSxZPOaE="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 274e69ca7768..a3b6c33d9de3 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/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.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; + sha256 = "sha256-P9MyhC6HWepffrd4nfiqdyuhVSFszxDvSqOw5bQuG0Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 55ab0f9ee1e5..e60c8a87c676 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/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.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; + hash = "sha256-NVhnJ8vXdRrMzywPNKiLr/wJL0NatiRY8Qd2RmWQ8tU="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix new file mode 100644 index 000000000000..948f2108d261 --- /dev/null +++ b/pkgs/development/python-modules/uhi/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchPypi +, buildPythonPackage +, hatchling +, hatch-vcs +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uhi"; + version = "0.3.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be"; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Universal Histogram Interface"; + homepage = "https://uhi.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix index 0bb9fc4e7b48..5167bc849469 100644 --- a/pkgs/development/python-modules/unicrypto/default.nix +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pycryptodome , pycryptodomex , pythonOlder @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "unicrypto"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nV3YWK1a1gj6UkmHsX6IVdZNbSRQygyhFjj02S/GyAs="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w="; }; propagatedBuildInputs = [ @@ -33,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified interface for cryptographic libraries"; homepage = "https://github.com/skelsec/unicrypto"; + changelog = "https://github.com/skelsec/unicrypto/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index be42bfc0792a..b50cd5eb8310 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "0.6"; + version = "0.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo="; + sha256 = "cbij55HZKVLO3MLoDTtFT2YYNVZwbNaYEk+35gIcGdo="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix index c417cb47e2d3..38debb91be11 100644 --- a/pkgs/development/python-modules/validphys2/default.nix +++ b/pkgs/development/python-modules/validphys2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/validphys/version.py \ - --replace '= __give_git()' '= "${version}"' + --replace '= __give_git()' '= "'$version'"' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 480b72e2e5df..74a29ae175e9 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; + hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 1bd12d4a3dc2..11bf821e0e6c 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM="; + hash = "sha256-UC8RkZCRodsK4DV0Pnn2jUohM7pNiqGWrbjWlDqn72I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index f3df712c3d51..133c9401a293 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/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/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 40303c29f9c9..e50a91c06039 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.6.0"; + version = "9.7.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI="; + sha256 = "sha256-O3WnG3JQ7CEHMPYTmE9pgnS8YZs717P6wBKBnXIvvFI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index d6747b3d7271..f15098491818 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/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/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index f6d1769f526b..e1139ecf1b14 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -104,7 +104,7 @@ buildPythonPackage rec { # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests preCheck = '' export HOME=$(mktemp -d) - export BOKEH_CDN_VERSION=3.0.3 + export BOKEH_CDN_VERSION=${bokeh.version} ''; pythonRelaxDeps = [ "protobuf" ]; diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index c31aa264bd84..82060561a8d4 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/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/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 4f6a8b00d213..7e7517980151 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.41.1"; + version = "0.42.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-RYxfz5uBWV1HLbcIK1N/glJv2w0nfPLBPyM2b7HuDIY="; + hash = "sha256-jxfV2RDyGLugnPae+uNtg/GBsWbKCSbKxuHll10guhU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index db66c2e9b1c8..7a8c691a8011 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.50.1"; + version = "0.52.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KYGNtUJXpY1UrRbUxr71EHxLCR6WixTAk+ybkfqB3Ps="; + hash = "sha256-SfdN/em4NrzNeItcaVuyOcUxmE50n5/jjmY4I5hfpQI="; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=9.3.0" "pillow" + --replace "pillow~=9.4.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch index 93db54b0c6e6..8e70f0069d65 100644 --- a/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch +++ b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch @@ -20,18 +20,15 @@ name that has the same encoding in each normal form. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py -index 651c034..9b94ac8 100644 +index 5a6db16..42cf121 100644 --- a/tests/test_bdist_wheel.py +++ b/tests/test_bdist_wheel.py -@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths): +@@ -69,7 +69,7 @@ def test_unicode_record(wheel_paths): with ZipFile(path) as zf: - record = zf.read('unicode.dist-0.1.dist-info/RECORD') + record = zf.read("unicode.dist-0.1.dist-info/RECORD") -- assert u'åäö_日本語.py'.encode('utf-8') in record -+ assert u'æɐø_日本價.py'.encode('utf-8') in record +- assert "åäö_日本語.py".encode() in record ++ assert "æɐø_日本價.py".encode() in record - def test_licenses_default(dummy_dist, monkeypatch, tmpdir): --- -2.17.2 (Apple Git-113) - + UTF8_PKG_INFO = """\ diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 8735a37b21ff..3be508a0ec59 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.37.1"; + version = "0.38.4"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; + hash = "sha256-yZLU0t/nz6kfnnoLL15bybOxN4+SJUaTJsCpGffl1QU="; name = "${pname}-${version}-source"; postFetch = '' cd $out diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index a89645d0ba77..184e5fe4c53d 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.26"; + 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-AnKzn3GScy9jgnb7vmQ2x73n5C/5VxJr+lR03HqVwMU="; + hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix index 80738318433d..208265ba9a3b 100644 --- a/pkgs/development/python-modules/wiffi/default.nix +++ b/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/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index f58ce1fecbf7..dc378d34d013 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ="; + hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index c868801e2d4e..aa59481b8ed4 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.15.0"; + version = "0.16.4"; 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-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 2d1cbab86c6d..af7f10e3fd8d 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.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/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index cfec72b96835..d306f83220e8 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/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.1"; 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-yF2L5VxUkqJjen5JeCQis4Q1o1KCJtRJ+S52wnS5VQg="; }; 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/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 6ad48ac12364..d3d06d407493 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/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/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 3e2de3d2afcd..230541176859 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.8"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; + hash = "sha256-1BjuFmsd7D9iCjaK5ckXXiU2LQXnIvJoJcu8YLaQe6g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index d2a113fb51d0..82d575d45a2f 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.9"; + version = "0.2.11"; 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-Lp8HqXq4PhvpTzFbldk70pU03+qsHzGeHIkaPdedvRo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 5aad3df78a63..7678b223297c 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -9,24 +9,25 @@ buildPythonPackage rec { pname = "z3c-checkversions"; - version = "1.2"; + version = "2.0"; src = fetchPypi { inherit version; pname = "z3c.checkversions"; - sha256 = "94c7ab0810ee6fdb66a4689b48e537b57e2dbee277cb1de2ece7a7f4d8c83001"; + hash = "sha256-rn4kl8Pn6YNqbE+VD6L8rVBQHkQqXSD47ZIy77+ashE="; }; propagatedBuildInputs = [ zc-buildout ]; + nativeCheckInputs = [ zope_testrunner ]; - doCheck = !python.pkgs.isPy27; + checkPhase = '' ${python.interpreter} -m zope.testrunner --test-path=src [] ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://github.com/zopefoundation/z3c.checkversions"; + changelog = "https://github.com/zopefoundation/z3c.checkversions/blob/${version}/CHANGES.rst"; description = "Find newer package versions on PyPI"; license = licenses.zpl21; }; diff --git a/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch new file mode 100644 index 000000000000..93db54b0c6e6 --- /dev/null +++ b/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch @@ -0,0 +1,37 @@ +From 5879a4bbc34d1eb25e160b15b2f5a4f10eac6bd2 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Mon, 13 Sep 2021 18:07:26 +0200 +Subject: [PATCH] =?UTF-8?q?tests:=20Rename=20a=CC=8Aa=CC=88o=CC=88=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E.py=20=3D>=20=C3=A6=C9=90=C3=B8=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E5=83=B9.py?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +`åäö_日本語.py` normalizes differently in NFC and NFD normal forms. This +means a hash generated for the source directory can differ depending on +whether or not the filesystem is normalizing and which normal form it +uses. + +By renaming the file to `æɐø_日本價.py` we avoid this issue by using a +name that has the same encoding in each normal form. +--- + tests/test_bdist_wheel.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py +index 651c034..9b94ac8 100644 +--- a/tests/test_bdist_wheel.py ++++ b/tests/test_bdist_wheel.py +@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths): + with ZipFile(path) as zf: + record = zf.read('unicode.dist-0.1.dist-info/RECORD') + +- assert u'åäö_日本語.py'.encode('utf-8') in record ++ assert u'æɐø_日本價.py'.encode('utf-8') in record + + + def test_licenses_default(dummy_dist, monkeypatch, tmpdir): +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/python2-modules/wheel/default.nix new file mode 100644 index 000000000000..8735a37b21ff --- /dev/null +++ b/pkgs/development/python2-modules/wheel/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bootstrapped-pip +, setuptools +}: + +buildPythonPackage rec { + pname = "wheel"; + version = "0.37.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; + name = "${pname}-${version}-source"; + postFetch = '' + cd $out + mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ + tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py + patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch} + ''; + }; + + nativeBuildInputs = [ + bootstrapped-pip + setuptools + ]; + + # No tests in archive + doCheck = false; + pythonImportsCheck = [ "wheel" ]; + + # We add this flag to ignore the copy installed by bootstrapped-pip + pipInstallFlags = [ "--ignore-installed" ]; + + meta = with lib; { + homepage = "https://github.com/pypa/wheel"; + description = "A built-package format for Python"; + longDescription = '' + This library is the reference implementation of the Python wheel packaging standard, + as defined in PEP 427. + + It has two different roles: + + - A setuptools extension for building wheels that provides the bdist_wheel setuptools command + - A command line tool for working with wheel files + + It should be noted that wheel is not intended to be used as a library, + and as such there is no stable, public API. + ''; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index d5b56f585eca..25cb3b4d7eb8 100644 --- a/pkgs/development/quickemu/default.nix +++ b/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/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a01c053f2ee6..f287605aa8f2 100644 --- a/pkgs/development/r-modules/default.nix +++ b/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 ]; @@ -1046,6 +1016,13 @@ let ''; }); + quarto = old.quarto.overrideDerivation (attrs: { + postPatch = '' + substituteInPlace "R/quarto.R" \ + --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" + ''; + }); + s2 = old.s2.overrideDerivation (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 880fff44ed64..05c069383e78 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/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/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 4672bad4ca4d..aa903a5637c0 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -66,9 +66,8 @@ let name; copyIfBundledByPath = { bundledByPath ? false, ...}: - (if bundledByPath then - assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ - else "" + (lib.optionalString bundledByPath ( + assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/") #*/ ); maybeCopyAll = pkgname: if pkgname == null then "" else diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 479981419801..21c4765abf2f 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -84,6 +84,7 @@ gem 'jwt' gem 'kramdown-rfc2629' gem 'libv8' gem 'libxml-ruby' +gem 'mail' gem 'magic' gem 'markaby' gem 'method_source' diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 4556b4360d7d..55624ef369e7 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-rmxLbxotATyURRcG9ryWCDHkH7a/bop/BCDQAoQjXSo="; + hash = "sha256-j0d2HK4McWA2yP7pt+TUOEYVUOQP4NYOdMlK7IqaAcU="; }; - vendorHash = "sha256-iG8g7mBbIulKSxc1a3/fOBOCWoFYaB5FLwJPNKJRZDg="; + vendorHash = "sha256-RG/aLlCve0XLj3ljBBSsloFUgNAG6faqjyMYXOo+CgI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 07ca36be34e4..dfc82c78d3ea 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.20.1"; + version = "2.21.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-nq7PY4CVSqfuTzN7ZDChTfYalYKb4uBG8ZnIBd7ernI="; + sha256 = "sha256-fX/GNDUUxO8LvPoeoT+tf0n3EcgJlm6kc1lx0lfbiq4="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 5d69cef598d0..312afa557ddd 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/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/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 0a9cefb57b06..0f560d0b3a15 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.12.1"; + version = "2.12.2"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs="; + sha256 = "sha256-n36x50rGA0fzvbwrUDpzWmF7XqwTTxnAfFtBL23gEOE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 51fd3aefa87e..1a8183ebab8d 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.10"; + version = "2.9.3"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY="; + hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c="; }; buildInputs = [ pcre diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index d340cb7562bf..eb23a0aae51f 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/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/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 449d5b6b5ed3..5c0a96e5d8e0 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; - rev = "v${version}"; - hash = "sha256-7GuIe8F3QqosW/XaN3KC1WeWcI7woUiEc9Nw0b+fSk0="; + rev = "refs/tags/v${version}"; + hash = "sha256-DW4R7+rnonmEMbCkNS7TGodw+3mEyHl6OlFK3kbG5HM="; fetchSubmodules = true; }; @@ -62,7 +62,7 @@ mkDerivation rec { mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git ''; - meta = { + meta = with lib; { description = "A GUI for Linux perf"; longDescription = '' hotspot is a GUI replacement for `perf report`. @@ -70,8 +70,9 @@ mkDerivation rec { then displays the result in a graphical way. ''; homepage = "https://github.com/KDAB/hotspot"; - license = with lib.licenses; [ gpl2Only gpl3Only ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ nh2 ]; + changelog = "https://github.com/KDAB/hotspot/releases/tag/v${version}"; + license = with licenses; [ gpl2Only gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 3eae91e939d3..68e9927522b5 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/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/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index e9437d718cf7..40a7909f34a1 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' sed '7i#include ' -i src/Scheduler.cc + sed '1i#include ' -i src/test-monitor/test-monitor.cc patchShebangs . ''; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index bb3d37f4f876..df6a7976de3e 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O758CU70NqRFlbtiy5cmfIHiHdQLxH88BHNZLQVvZ+M="; + sha256 = "sha256-tsnW6KoLHEWd/uDZrK2cnVZ2IWftoxZ5zGdYhRdUp9Q="; }; - vendorSha256 = "sha256-4ODf6Er7V5KsVUdWjqjv+dfH84PPR+5T29V1AJluoJA="; + vendorSha256 = "sha256-crGs7j9hAnGCCFjhigIJVpTM0rr9WgvBq3/ZGt6hwqQ="; doCheck = false; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 3bec558803b4..9949ec7ec7c7 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build on ELFv2 powerpc64 + # https://bugs.kde.org/show_bug.cgi?id=398883 + (fetchurl { + url = "https://github.com/void-linux/void-packages/raw/3e16b4606235885463fc9ab45b4c120f1a51aa28/srcpkgs/valgrind/patches/elfv2-ppc64-be.patch"; + sha256 = "NV/F+5aqFZz7+OF5oN5MUTpThv4H5PEY9sBgnnWohQY="; + }) # Fix checks on Musl. # https://bugs.kde.org/show_bug.cgi?id=453929 (fetchpatch { diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/development/tools/ansi/default.nix index 305b29aef6f9..13794dee2e15 100644 --- a/pkgs/development/tools/ansi/default.nix +++ b/pkgs/development/tools/ansi/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { description = "Quickly get ANSI escape sequences"; longDescription = '' CLI utility called "ansi" to quickly get ANSI escape sequences. Supports - the colors and styles, such as bold or italic."; + the colors and styles, such as bold or italic. ''; homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 82571293abc6..f9bed90f8ba4 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.5.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; + hash = "sha256-U8vHwdL1O54X0jPhcjTN/J1U7dKQgFEMfc6lbXe2Ff0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index a38acbd53c94..a062d18096dc 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/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/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index fd8a78a1ac6b..aeec00e99a9b 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/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/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix index 606633fd3a1a..d0956845092f 100644 --- a/pkgs/development/tools/bbin/default.nix +++ b/pkgs/development/tools/bbin/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/share cp -r docs $out/share/docs wrapProgram $out/bin/bbin \ - --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + --prefix PATH : "${lib.makeBinPath [ babashka babashka.graalvmDrv ]}" runHook postInstall ''; diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 610b991ec52a..819cccf95c61 100644 --- a/pkgs/development/tools/biodiff/default.nix +++ b/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-anGiqTiZVm6q8BII1Ahg2ph7OwX5isCa16orEcf4aFE="; + hash = "sha256-IrIRBozW2nNqt3/643jQ9sHT/YIpYhWeG749bTR4+60="; }; - cargoSha256 = "sha256-uyATu6M04IRFtzFb2ox0xUYFXjkW+t+71Iy58TuqCko="; + cargoHash = "sha256-EkvZk5l2Jw/6Ejrz4gYFWz9IZLjz0Op/1z3BGBV07dA="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/development/tools/bpf-linker/default.nix index d1839eb86fab..49780a7772e4 100644 --- a/pkgs/development/tools/bpf-linker/default.nix +++ b/pkgs/development/tools/bpf-linker/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages_14 +, llvmPackages_15 , zlib , ncurses , libxml2 @@ -10,21 +10,21 @@ rustPlatform.buildRustPackage rec { pname = "bpf-linker"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "aya-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-jYuBk78aGQLUeNF6d6kjGPuMxEF22XJquHcs23WVGm0="; + hash = "sha256-LEZ2to1bzJ/H/XYytuh/7NT7+04aI8chpKIFxxVzM+4="; }; - cargoHash = "sha256-X8EVpOxDHwE/wj/gly/wdZ6tsrMrz3kkDe9gEPbk6iw="; + cargoHash = "sha256-s8cW7lXtvgemuQueTtAywewnDVJ/WDcz8SBqsC/tO80="; buildNoDefaultFeatures = true; buildFeatures = [ "system-llvm" ]; - nativeBuildInputs = [ llvmPackages_14.llvm ]; + nativeBuildInputs = [ llvmPackages_15.llvm ]; buildInputs = [ zlib ncurses libxml2 ]; # fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 79c7962865e1..7508e77da965 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-FEc83SVFCsGDrCg7IYmn8iZ6NozYFsIUJ3QORBYUdMI="; + hash = "sha256-fosvr8l/xql4j2/mGjbvbJQMUqBqBUturQJq+OQT/wM="; }; - vendorHash = "sha256-Zmias6mJWYh+PCyBdnRlNyKIoFqEYJZNF19i559SGTI="; + vendorHash = "sha256-ZYmYLZXEzWrTt6JJOWyTmbVq8p7D8lhz07bmQ2Z7gKc="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index cd313a5bc50b..693ecce9d1e1 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/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/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index b371a1f11159..90e5098a364e 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.21"; + version = "3.1.0"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU="; + sha256 = "sha256-b9QeXUdvXoJNFxi7i2IVq7Xeyo5T54A0Sl9BvAV25JM="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index 9775665869fd..cad1e0d47f08 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "bob"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U="; + hash = "sha256-yPdAf/j/vpQ2j+Zp8D7us7yaiDs47sKFPHZgggDjT3w="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - vendorHash = "sha256-dmMoFyl9IX0QS6sNC6qzC4DQQQfvxmxuUeUfx0DBd/I="; + vendorHash = "sha256-6wAbwZKm8RTMt2Wm90N3AYZREipdo7Dq+XTWsLANd88="; excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index d94dccf7fbc8..d283e1e321db 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -40,5 +40,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.jgertm maintainers.marsam ]; license = licenses.asl20; platforms = platforms.all; + # https://github.com/facebook/buck/issues/2666 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/pkgs/development/tools/build-managers/cmake/002-application-services.diff index 7c77336b41be..56f7cd266b7a 100644 --- a/pkgs/development/tools/build-managers/cmake/002-application-services.diff +++ b/pkgs/development/tools/build-managers/cmake/002-application-services.diff @@ -1,20 +1,18 @@ -diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 9a18184fd3..278d146dd1 100644 ---- a/Source/CMakeLists.txt -+++ b/Source/CMakeLists.txt -@@ -933,7 +933,6 @@ endif() +diff -Naur cmake-3.25.1-old/Source/CMakeLists.txt cmake-3.25.1-new/Source/CMakeLists.txt +--- cmake-3.25.1-old/Source/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Source/CMakeLists.txt 2022-12-19 01:00:08.412064304 -0300 +@@ -916,7 +916,6 @@ # On Apple we need CoreFoundation and CoreServices if(APPLE) - target_link_libraries(CMakeLib "-framework CoreFoundation") -- target_link_libraries(CMakeLib "-framework CoreServices") + target_link_libraries(CMakeLib PUBLIC "-framework CoreFoundation") +- target_link_libraries(CMakeLib PUBLIC "-framework CoreServices") endif() if(WIN32 AND NOT UNIX) -diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx -index 77403b076a..d5aac95e1e 100644 ---- a/Source/cmGlobalXCodeGenerator.cxx -+++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -49,10 +49,6 @@ struct cmLinkImplementation; +diff -Naur cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx +--- cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx 2022-12-19 01:00:56.065135169 -0300 +@@ -56,10 +56,6 @@ #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) # include @@ -25,19 +23,17 @@ index 77403b076a..d5aac95e1e 100644 #endif #if !defined(CMAKE_BOOTSTRAP) -diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index 79452ffff6..a848731b7e 100644 ---- a/Utilities/cmlibarchive/CMakeLists.txt -+++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST) +diff -Naur cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt +--- cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt 2022-12-19 01:01:43.392205981 -0300 +@@ -2041,10 +2041,6 @@ + ADD_CUSTOM_TARGET(run_all_tests) ENDIF(ENABLE_TEST) - ENDIF() -# We need CoreServices on Mac OS. -IF(APPLE) - LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") -ENDIF(APPLE) -- + add_subdirectory(libarchive) IF(0) # CMake does not build libarchive's command-line tools. - add_subdirectory(cat) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0a1e191ba360..2aff749ebcb0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.24.3"; + version = "3.25.1"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-tTqhD6gr/4TM21kGWSe3LTvuSfTYYmEkn8CYSzs2cpE="; + sha256 = "sha256-HFEdCVFq9JNpTtm68TxVlHo2OJZ01lei1eDM7caykdg="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 5591b1634236..d0306dd33a49 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,19 +1,26 @@ { lib +, stdenv , fetchpatch , installShellFiles , ninja , pkg-config , python3 +, zlib +, coreutils , substituteAll +, Foundation +, OpenGL +, AppKit +, Cocoa }: python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.64.1"; + version = "1.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk="; + hash = "sha256-qlCkukVXwl59SERqv96FeVfc31g4X/++Zwug6O+szgU="; }; patches = [ @@ -61,17 +68,38 @@ python3.pkgs.buildPythonApplication rec { "docs/yaml/objects/dep.yaml" ]; }) - ]; + + # tests: avoid unexpected failure when cmake is not installed + # https://github.com/mesonbuild/meson/pull/11321 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/a38ad3039d0680f3ac34a6dc487776c79c48acf3.patch"; + hash = "sha256-9YaXwc+F3Pw4BjuOXqva4MD6DAxX1k5WLbn0xzwuEmw="; + }) + ] + # Nixpkgs cctools does not have bitcode support. + ++ lib.optional stdenv.isDarwin ./disable-bitcode.patch; + + postPatch = if stdenv.isDarwin then '' + rm -r 'test cases/osx/7 bitcode' + '' else null; setupHook = ./setup-hook.sh; - # Meson included tests since 0.45, however they fail in Nixpkgs because they - # require a typical building environment (including C compiler and stuff). - # Just for the sake of documentation, the next lines are maintained here. - doCheck = false; nativeCheckInputs = [ ninja pkg-config ]; + checkInputs = [ zlib ] + ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; checkPhase = '' - python ./run_project_tests.py + patchShebangs "test cases" + substituteInPlace "test cases/native/8 external program shebang parsing/script.int.in" \ + --replace /usr/bin/env ${coreutils}/bin/env + # requires git, creating cyclic dependency + rm -r "test cases/common/66 vcstag" + # requires glib, creating cyclic dependency + rm -r "test cases/linuxlike/6 subdir include order" + rm -r "test cases/linuxlike/9 compiler checks with dependencies" + # requires static zlib, see #66461 + rm -r "test cases/linuxlike/14 static dynamic linkage" + HOME="$TMPDIR" python ./run_project_tests.py ''; postFixup = '' @@ -84,6 +112,9 @@ python3.pkgs.buildPythonApplication rec { # Do not propagate Python rm $out/nix-support/propagated-build-inputs + + substituteInPlace "$out/share/bash-completion/completions/meson" \ + --replace "python3 -c " "${python3.interpreter} -c " ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/pkgs/development/tools/build-managers/meson/disable-bitcode.patch new file mode 100644 index 000000000000..a72997c10439 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/disable-bitcode.patch @@ -0,0 +1,24 @@ +--- a/mesonbuild/compilers/mixins/clang.py ++++ b/mesonbuild/compilers/mixins/clang.py +@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler): + {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'), + OptionKey('b_thinlto_cache_dir')}) + +- # TODO: this really should be part of the linker base_options, but +- # linkers don't have base_options. +- if isinstance(self.linker, AppleDynamicLinker): +- self.base_options.add(OptionKey('b_bitcode')) + # All Clang backends can also do LLVM IR + self.can_compile_suffixes.add('ll') + +--- a/mesonbuild/linkers/linkers.py ++++ b/mesonbuild/linkers/linkers.py +@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): + return self._apply_prefix('-headerpad_max_install_names') + + def bitcode_args(self) -> T.List[str]: +- return self._apply_prefix('-bitcode_bundle') ++ raise MesonException('Nixpkgs cctools does not support bitcode bundles') + + def fatal_warnings(self) -> T.List[str]: + return self._apply_prefix('-fatal_warnings') diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 8fcb5f2dbac1..4e42927d0293 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.24"; + version = "2.0.25"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "sha256-nunPDYAy0yfDJpsc+E8SyyFLny19wwrVzxeUOhh7nc4="; + sha256 = "sha256-wqZEAfGRHhcd7Xm2pQ0FTjZGfuPafRrZAUdpc7ACoEA="; }; nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 747abef1e982..4f5d440858ef 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/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/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index d108422919f9..79d105128ba9 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/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/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix index 093e015d36e2..dfbac9aac0ba 100644 --- a/pkgs/development/tools/clickable/default.nix +++ b/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/pkgs/development/tools/cobra-cli/default.nix b/pkgs/development/tools/cobra-cli/default.nix index 989c2f161f6d..a3f277259f2b 100644 --- a/pkgs/development/tools/cobra-cli/default.nix +++ b/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/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index 2b17f00863b0..186b8b4fdb73 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/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/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 9fd3a86f597d..e5f017de1e1e 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.15.3"; + version = "0.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4="; + hash = "sha256-FHBaefwSGZXwn1jdU7zK8WhwjarknvyeUJTlhmk/hPM="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg="; + vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 9da227601024..13d99813c767 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-kbWRjOXfDTVI07KuMQHcyxjenc7fW4oWRgyThzO0Pac="; + hash = "sha256-FVY4mcf08az3poA2AabqnMnQsJ1Jbqqo5oKUNft+XRk="; }; - vendorHash = "sha256-8ZGZzb7Ikfk9DZQ6zyB+4JJuqyo4nlBDhGWUb8MtSys="; + vendorHash = "sha256-IzWb5TvZp9wfzjtk3wYWsJepwJU7qeOAoLFt91rqMRQ="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 9e5dc5628ba7..4524224cd69c 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.10"; + version = "0.3.12"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-/JbKnDjC3C0mF4WHOmmvblrr/e1MhOws3Q/oXZCgdEM="; + hash = "sha256-70qN5cZb0EjBPE5xpeKUv46JD+B8rYaDejAfaqC0Y4M="; }; - vendorHash = "sha256-wufztmiOwgY0Q6x9oMrJo28JGx8iprC1gr9zZjSWwuw="; + vendorHash = "sha256-9a5W8+tQ5rhtq4uul84AtxcKOc25lfe7bMpgbhRT9/Y="; proxyVendor = true; subPackages = [ diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 20ba407e3d03..fbdcbcde7c45 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.9.0"; + version = "7.9.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-YatN0VG3oEUK+vzJzthRnX+EkvUgKq2uIunAoPMoRag="; + sha256 = "sha256-ySyarky92+VSo/KzQFrWeh35KDMTQDV34F5iFrARHJs="; }; - vendorSha256 = "sha256-nX0r/7V+rgJb3/9O91QskYzBpWXIca7m3Do1QtGuHgg="; + vendorHash = "sha256-Oy1wP82ZhdpGHs/gpfdveOK/jI9yuo0D3JtxjLg+W/w="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 143362d98a4c..1fbd2fcf9968 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.301.1"; + version = "2.302.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-GIWuN3/CnA0uZfpo1Gty+5tL2eDXmFyzYFHrRozHwk0="; + hash = "sha256-eIMiXdw62JGlSnMkmFf9vqOpp1QC9DkD/2wDPHJuVBI="; }; nativeBuildInputs = [ @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse ]; + maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; platforms = attrNames runtimeIds; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 14984ba9519e..29d9412137a9 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.8.0"; + version = "15.8.2"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; + sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3e909be05915..98aff1787616 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.375.2"; + version = "2.375.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-5XJSX3+kOwguIolvclcCl9iNrsTzarTyX9rcqIX5VJI="; + hash = "sha256-1WBl8eXEMj/sNqlqv3cQskUeNLxPudoXnn3xKaTMwaw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix deleted file mode 100644 index e64cf02e9f7e..000000000000 --- a/pkgs/development/tools/cosmoc/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, cosmopolitan }: - -stdenv.mkDerivation { - pname = "cosmoc"; - inherit (cosmopolitan) version; - - doInstallCheck = true; - dontUnpack = true; - dontBuild = true; - - # compiler arguments based on upstream README.md - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cat <$out/bin/cosmoc - #!${stdenv.shell} - exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ - -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ - -fno-omit-frame-pointer -pg -mnop-mcount -mno-tls-direct-seg-refs \ - "\$@" \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds -Wl,--gc-sections \ - -include ${cosmopolitan}/include/cosmopolitan.h \ - ${cosmopolitan}/lib/{crt.o,ape-no-modify-self.o,cosmopolitan.a} - EOF - chmod +x $out/bin/cosmoc - runHook postInstall - ''; - - installCheckPhase = '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c - $out/bin/cosmoc hello.c - ./a.out - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "compiler for Cosmopolitan C programs"; - license = licenses.mit; - maintainers = teams.cosmopolitan.members; - }; -} diff --git a/pkgs/development/tools/cosmocc/default.nix b/pkgs/development/tools/cosmocc/default.nix new file mode 100644 index 000000000000..71028d1a1968 --- /dev/null +++ b/pkgs/development/tools/cosmocc/default.nix @@ -0,0 +1,35 @@ +{ runCommand, lib, cosmopolitan }: + +let + cosmocc = + runCommand "cosmocc" + { + pname = "cosmocc"; + inherit (cosmopolitan) version; + + meta = with lib; { + homepage = "https://justine.lol/cosmopolitan/"; + description = "compilers for Cosmopolitan C/C++ programs"; + license = licenses.mit; + maintainers = teams.cosmopolitan.members; + }; + passthru.tests = { + cc = runCommand "c-test" { } '' + cat > hello.c << END + #include + int main() { + printf("Hello world!\n"); + return 0; + } + END + ${cosmocc}/bin/cosmocc hello.c + ./a.out > $out + ''; + }; + } '' + mkdir -p $out/bin + install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin + sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* + ''; +in +cosmocc diff --git a/pkgs/development/tools/database/pgagroal/default.nix b/pkgs/development/tools/database/pgagroal/default.nix new file mode 100644 index 000000000000..e86e19f8f2e1 --- /dev/null +++ b/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/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch b/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch new file mode 100644 index 000000000000..7f65205332b8 --- /dev/null +++ b/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/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 4381dd83b62c..9c6927136097 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: https://rubygems.org/ specs: parallel (1.22.1) - pg (1.4.4) - pgsync (0.7.2) + pg (1.4.5) + pgsync (0.7.3) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.9.3) + slop (4.10.0) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index f556be4eb99d..3224efedfc12 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78"; + sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.3"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; + sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; type = "gem"; }; - version = "4.9.3"; + version = "4.10.0"; }; tty-cursor = { groups = ["default"]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 08f7cce9022b..0b82242fa810 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/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/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 2f26262143d1..7dea51ef567e 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/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/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index 5bfdb06600d0..fe4108840c50 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -1,5 +1,5 @@ { buildFHSUserEnv -, electron_20 +, electron_22 , fetchFromGitHub , fetchYarnDeps , fixup_yarn_lock @@ -14,21 +14,21 @@ let pname = "electron-fiddle"; - version = "0.31.0"; - electron = electron_20; + version = "0.32.1"; + electron = electron_22; nodejs = nodejs-16_x; src = fetchFromGitHub { owner = "electron"; repo = "fiddle"; rev = "v${version}"; - hash = "sha256-GueLG+RYFHi3PVVxBTtpTHhfjygcQ6ZCbrp5n5I1gBM="; + hash = "sha256-k+cbg03mwvobyazIUqm+TO9OMYVFQICy4CtkUZmvkr8="; }; inherit (nodejs.pkgs) yarn; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-WVH1A0wtQl5nR1hvaL6mzm/7XBvo311FPKmsxB82e4U="; + hash = "sha256-3vM+YPIA3zeWBaEFXU5lFl+VaGmAY0Qdg4pSA6mIKl0="; }; electronDummyMirror = "https://electron.invalid/"; @@ -89,12 +89,14 @@ in buildFHSUserEnv { name = "electron-fiddle"; runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar"; + extraInstallCommands = '' mkdir -p "$out/share/icons/hicolor/scalable/apps" ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/" mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications"/*.desktop "$out/share/applications/" ''; + targetPkgs = pkgs: with pkgs; map lib.getLib [ diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index eee953862890..caa0150d4b44 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -32,7 +32,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "20.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "21.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 34a7a166efd6..c204e91b2763 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.5"; + version = "0.17.8"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-QLV6+1se3F7naG3jgXtSfmoTR0d7cFByRznzf+xjDpk="; + hash = "sha256-UJIbx0UkpHYMgDr+1dbNoMLrY5hWs0E2Ehu3txG/80E="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 55fa760475d9..12eccd200ab6 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.15.4"; + version = "0.15.9"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-Dj4Wli1z4X8FgnthjPszC/h4EIeFiMO/YB5Rlkis5f8="; + sha256 = "sha256-DudZOIwpsa7VaOQMJ2P/mfWHWYwESNhDfIUbtMV5Es0="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2921a7b39445..2f111370d222 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.12.0"; + version = "9.14.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; + sha256 = "sha256-a4wApae08oQBVOSvLJFfU0ZB8mOJbjsnD/SgpCq6IYc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 170b9c41dc9f..0dfd153e2199 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "gci"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + sha256 = "sha256-VbN4lRK+6stOApMEdtX32JhKGkCSrafMJbizpWmHRXA="; }; - vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + vendorHash = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; meta = with lib; { description = "Controls golang package import order and makes it always deterministic"; diff --git a/pkgs/development/tools/gdtoolkit/default.nix b/pkgs/development/tools/gdtoolkit/default.nix new file mode 100644 index 000000000000..67d98e0aa36b --- /dev/null +++ b/pkgs/development/tools/gdtoolkit/default.nix @@ -0,0 +1,84 @@ +{ lib +, python3Packages +, fetchFromGitHub +, godot-server +}: + +let lark080 = python3Packages.lark.overrideAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "0.8.0"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; + fetchSubmodules = true; + }; +}); + +in +python3Packages.buildPythonApplication rec { + pname = "gdtoolkit"; + version = "3.3.1"; + + # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) + src = fetchFromGitHub { + owner = "Scony"; + repo = "godot-gdscript-toolkit"; + rev = version; + sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; + }; + + disabled = python3Packages.pythonOlder "3.7"; + + propagatedBuildInputs = [ lark080 + ] ++ (with python3Packages; [ + docopt + pyyaml + setuptools + ]); + + doCheck = true; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + hypothesis + godot-server + ]; + + preCheck = + let + godotServerMajorVersion = lib.versions.major godot-server.version; + gdtoolkitMajorVersion = lib.versions.major version; + msg = '' + gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}! + gdtoolkit needs a matching godot-server for its tests. + If you see this error, you can either: + - disable doCheck for gdtoolkit, or + - provide a compatible godot-server version to gdtoolkit" + ''; + in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' + # The tests want to run the installed executables + export PATH=$out/bin:$PATH + + # gdtoolkit tries to write cache variables to $HOME/.cache + export HOME=$TMP + + # Work around https://github.com/godotengine/godot/issues/20503 + # Without this, Godot will complain about a missing project file + touch project.godot + + # Remove broken test case + # (hard to skip via disabledTests since the test name contains an absolute path) + rm tests/potential-godot-bugs/multiline-subscription-expression.gd + ''; + + pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; + + meta = with lib; { + description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; + homepage = "https://github.com/Scony/godot-gdscript-toolkit"; + license = licenses.mit; + maintainers = with maintainers; [ shiryel tmarkus ]; + }; +} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 1171700ff99e..27d51b195fe7 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.32.0"; + version = "0.32.2"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; + sha256 = "sha256-w2zGiRvhuPMo79UsnckSISyCwBcIg5sfXIJLmnT3Tnk="; }; - cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; + cargoHash = "sha256-8P62yQpGXgswfSnAji0cIJwarx8IW0S5DO5gUMMp5PI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fcebe93aaa2d..06016bec25b5 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; + postPatch = '' + sed '1i#include ' -i src/tools/text.cpp # gcc12 + ''; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix new file mode 100644 index 000000000000..4ce214ee415f --- /dev/null +++ b/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/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 9a8f20529537..ab6723bebba2 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.16.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fd+ZR74tApbZEXfMqpUAMk22h9rMRmtByGSd8JcTtK0="; + sha256 = "sha256-lWh0aX+VuSL0w592lNqXpwHq/b2WeDyYiBzm224qnzc="; }; 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/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 3890133256ed..5077bc45b82f 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "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/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 5732b8f44f62..d0c85be47336 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -53,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta16"; + version = "4.0-rc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "518b9e5801a19229805fe837d7d0cf92920ad413"; - sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY="; + rev = "c4fb119f03477ad9a494ba6cdad211b35a8efcce"; + hash = "sha256-YJrm3or4QSzs+MDc06gY6TvUtWRgLST8RkdsomY8lZk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index ccd230cc5f5c..f3a54a83a636 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/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/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index f2cf1f8a48ff..245f86788a59 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "goresym"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v7rZBVpQMuEoIK9JIXCJnSjMDe3wrtJvL766MN6VmFo="; + sha256 = "sha256-Tf/oD0f8XLG2CuiQvduVberzWSetojVRBrSd83snK5Q="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; + vendorHash = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; doCheck = true; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 84f221f7afb9..2bb15698e065 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OPMXU24INpdeQrNlRIPJBag6TtHFFIdxlBTfMgRZc2U="; + sha256 = "sha256-GB+BAGIVPtyY2Bsm/yDTYjJixLGvGwsIoOLCyy/0AJk="; }; - vendorSha256 = "sha256-F/wtDYPF4qUujU+fJx2v9uwlkxQ1LMPECKxHR4EB1zk="; + vendorHash = "sha256-5LIIXf+8ZN7WcFSPzsJ5Tt+d40AgF5YI3O1oXms1WgI="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index b21b1be54d8e..002d9b9548db 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-dsso9KQMZhFgnN6CxoQbXRnjbfaKeLRA8ZEYc9NYEe0="; + hash = "sha256-EsqOpVCsn0bD0BAOoFifH1hfEF8Wu8bUpM0/BSXAewY="; }; vendorHash = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix new file mode 100644 index 000000000000..ce8f769ae442 --- /dev/null +++ b/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/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 2a1197cae0c8..0eeeba6fa767 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.102.0"; + version = "0.103.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-5T0MQ1b1kA7MVm2drNbUdK6CitTjT76ORPN/BJmsmsM="; + sha256 = "sha256-81Le1xVftyQkt5Jm2JXRxID/ySNS1Tcl+BRIsDYeg1k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 31d6d281ba5f..a64fab3353fe 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -20,6 +20,8 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index d18b32c6f440..750e93f66557 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/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/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index cbb8b38d80d7..61fe400586cf 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mNritx2YY6x5lwnOWrraHzddRZqEySDOWGOqdmqUyIs="; + sha256 = "sha256-GDHpITuDdZBphkjQGcnhN7H6yHA9CsyVBkinFsM2RrA="; }; - vendorSha256 = "sha256-pqGayeo4JkleZaoZfZW6agbMrK+57tYriKCWXGveoUs="; + vendorHash = "sha256-Ou73kXEcyxXW6u0dUBvx9alJrloc/CUm1VWKphCUPCg="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 57723da45eb3..0ddbf8f5d5a9 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/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/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 4d363d4e75f4..f58b3de97740 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/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/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 28c80444650d..6136c5b6cb22 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8CZcPZLainc7iRZ5Ul27QxW3oK7sikCjzCBEkfCeNUc="; + sha256 = "sha256-piCsae2B+FC+wi/vCCtPY76O4eMXJeNufFo31QkHCAU="; }; - vendorHash = "sha256-GBjMN6pyB+48e5LNqLBbh6a5fC9P0T53CZUPGNcbBDc="; + vendorHash = "sha256-vTP2wM7MqiSfP+3Gd0Ab5t0al5xL8rw3kl7bOT19zU4="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix similarity index 63% rename from pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix rename to pkgs/development/tools/language-servers/lua-language-server/default.nix index 24b360a78180..04b5fd6e1e02 100644 --- a/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix +++ b/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.11"; src = fetchFromGitHub { - owner = "sumneko"; + owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; + sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M="; 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,21 @@ 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"; + changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ sei40kr ]; + maintainers = with maintainers; [ figsoda sei40kr ]; platforms = platforms.linux ++ platforms.darwin; - mainProgram = "lua-language-server"; }; } diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 036c5057d899..66488a607fd1 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/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/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index d39b91180f98..91ac7b7bce05 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/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/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch index 19d20309c106..57b152d9db31 100644 --- a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch +++ b/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/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 57c405a7f7b5..4e60fffbeb59 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/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/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index c2bb6828bc2a..132faaa4aeee 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "sha256-JULVX5gyMJhnBwGQxmMObtUaenu37rIE5yDbA5fHsCY="; + sha256 = "sha256-ncZ1tof8InP+8KLTQ2YOwaD/liwU1LNZkllBm53VYNo="; }; - cargoHash = "sha256-PQbN0qsCf4eia5sD71ltP7Y955smZPwkof+uEQATvNQ="; + cargoHash = "sha256-xxR80iizEej1vAzItaoqQnJDZ62dxPOeEdaUpgqhG7I="; buildFeatures = [ "cli" diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index a7c8c1f8db30..9a4c95706f00 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.8.3"; + version = "3.8.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-IrgypySq5RUi9X3pVC0t+Ezw7aNu8mIKZYY4CEaKhU4="; + sha256 = "sha256-PbTuhJ+l3s+vwo5Y93GpQIah71zah5aFgV/pBSyJDKY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 1c6fa49d7c1a..a8fd24ebd6a3 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/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/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch deleted file mode 100644 index 0b4162d84880..000000000000 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/bfd/configure.ac b/bfd/configure.ac -index fec067b2135..377e1f5443f 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -292,30 +292,16 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --# When building a shared libbfd, link against the pic version of libiberty --# so that apps that use libbfd won't need libiberty just to satisfy any --# libbfd references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libbfd. - SHARED_LIBADD= --SHARED_LDFLAGS= -+SHARED_LDFLAGS=-liberty - if test "$enable_shared" = "yes"; then --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi --fi -- - SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" - --if test "$enable_shared" = "yes"; then - case "${host}" in - # More hacks to build DLLs on Windows. - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32" -+ SHARED_LIBADD="-liberty $SHARED_LIBADD -lcygwin -lkernel32" - ;; - esac - -diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 0e04b4c05c4..848a02662e7 100644 ---- a/opcodes/Makefile.am -+++ b/opcodes/Makefile.am -@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) - endif - - # This is where bfd.h lives. --BFD_H = ../bfd/bfd.h -+BFD_H = $(BFDDIR)/bfd.h - - BUILD_LIBS = @BUILD_LIBS@ - BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ - # development.sh is used to determine -Werror default. - CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh - --AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ - - disassemble.lo: disassemble.c - if am__fastdepCC -@@ -327,9 +327,18 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c --libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ -+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion - libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ --libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ -+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ - # Allow dependency tracking to work on all the source files. - EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) - -+libtool-soversion: -+ @echo "creating $@" -+ bfd_soversion="$(VERSION)" ;\ -+ . $(BFDDIR)/development.sh ;\ -+ if test "$$development" = true ; then \ -+ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ fi ;\ -+ echo "$${bfd_soversion}" > $@ -+ - # libtool will build .libs/libopcodes.a. We create libopcodes.a in - # the build directory so that we don't have to convert all the - # programs that use libopcodes.a simultaneously. This is a hack which -diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index e564f067334..5da62a3d58b 100644 ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -98,6 +98,8 @@ BFD_64_BIT - AC_SUBST(HDEFINES) - AC_PROG_INSTALL - -+GCC_HEADER_STDINT(bfd_stdint.h) -+ - AC_CHECK_DECLS([basename, stpcpy]) - - # Check if sigsetjmp is available. Using AC_CHECK_FUNCS won't do -@@ -148,44 +150,21 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --#Libs for generator progs --if test "x$cross_compiling" = "xno"; then -- BUILD_LIBS=../libiberty/libiberty.a -- BUILD_LIB_DEPS=$BUILD_LIBS --else -- # if cross-compiling, assume that the system provides -liberty -- # and that the version is compatible with new headers. -- BUILD_LIBS=-liberty -- BUILD_LIB_DEPS= --fi --BUILD_LIBS="$BUILD_LIBS $LIBINTL" --BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" -+BUILD_LIBS="-liberty $LIBINTL" -+BUILD_LIB_DEPS="$LIBINTL_DEP" - - AC_SUBST(BUILD_LIBS) - AC_SUBST(BUILD_LIB_DEPS) - - # Horrible hacks to build DLLs on Windows and a shared library elsewhere. - SHARED_LDFLAGS= --SHARED_LIBADD= -+SHARED_LIBADD=-liberty - SHARED_DEPENDENCIES= --if test "$enable_shared" = "yes"; then --# When building a shared libopcodes, link against the pic version of libiberty --# so that apps that use libopcodes won't need libiberty just to satisfy any --# libopcodes references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libopcodes. - # Note that linking against libbfd as we do here, which is itself linked - # against libiberty, may not satisfy all the libopcodes libiberty references - # since libbfd may not pull in the entirety of libiberty. - # Also, jam libintl into the right place in all of this: after libiberty, - # which uses it, but before -lcygwin, which it uses. --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi --fi - - SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" - -@@ -193,11 +172,10 @@ if test "$enable_shared" = "yes"; then - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" -+ SHARED_LIBADD="-lbfd -liberty $SHARED_LIBADD" - ;; - *) -- SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -+ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" - ;; - esac - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 39e852a60bbb..208b404f1ead 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -31,12 +31,12 @@ assert enableGold -> withGold stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.39"; + version = "2.40"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "sha256-2iSoT+8iAQLdJAQt8G/eqFHCYUpTd/hu/6KPM7exYUg="; + hash = "sha256-+CmOsVOks30RLpRapcsoUAQLzyaj6mW1pxXIOv4F5Io="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -84,12 +84,10 @@ stdenv.mkDerivation (finalAttrs: { # cross-compiling. ./always-search-rpath.patch - # Upstream backport of https://sourceware.org/PR29451: - # Don't emit 0-sized debug entries for objects without size. - # Without the change elfutils on i686-linux fail dwarf validity test: - # https://sourceware.org/PR29450 - # Remove once 2.40 releases. - ./gas-dwarf-zero-PR29451.patch + # Avoid `lib -> out -> lib` reference. Normally `bfd-plugins` does + # not need to know binutils' BINDIR at all. It's an absolute path + # where libraries are stored. + ./plugins-no-BINDIR.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution @@ -105,7 +103,15 @@ stdenv.mkDerivation (finalAttrs: { else ./mips64-default-n64.patch) ; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" "info" "man" "dev" ] + # Ideally we would like to always install 'lib' into a separate + # target. Unfortunately cross-compiled binutils installs libraries + # across both `$lib/lib/` and `$out/$target/lib` with a reference + # from $out to $lib. Probably a binutils bug: all libraries should go + # to $lib as binutils does not build target libraries. Let's make our + # life slightly simpler by installing everything into $out for + # cross-binutils. + ++ lib.optionals (targetPlatform == hostPlatform) [ "lib" ]; strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -196,8 +202,12 @@ stdenv.mkDerivation (finalAttrs: { # Unconditionally disable: # - musl target needs porting: https://sourceware.org/PR29477 - # - all targets rely on javac: https://sourceware.org/PR29479 "--disable-gprofng" + + # By default binutils searches $libdir for libraries. This brings in + # libbfd and libopcodes into a default visibility. Drop default lib + # path to force users to declare their use of these libraries. + "--with-lib-path=:" ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ] ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ] @@ -218,10 +228,26 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + # For the same reason we don't split "lib" output we undo the $target/ + # prefix for installed headers and libraries we link: + # $out/$host/$target/lib/* to $out/lib/ + # $out/$host/$target/include/* to $dev/include/* + # TODO(trofi): fix installation paths upstream so we could remove this + # code and have "lib" output unconditionally. + postInstall = lib.optionalString (hostPlatform.config != targetPlatform.config) '' + ln -s $out/${hostPlatform.config}/${targetPlatform.config}/lib/* $out/lib/ + ln -s $out/${hostPlatform.config}/${targetPlatform.config}/include/* $dev/include/ + ''; + passthru = { inherit targetPrefix; hasGold = enableGold; isGNU = true; + # Having --enable-plugins is not enough, system has to support + # dlopen() or equivalent. See config/plugins.m4 and configure.ac + # (around PLUGINS) for cases that support or not support plugins. + # No platform specific filters yet here. + hasPluginAPI = enableGold; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch deleted file mode 100644 index 5f1293f8f732..000000000000 --- a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d7abcbcea5ddd40a3bf28758b62f35933c59f996 - -Don't emit 0-sized debug entries for objects without size. -Without the change elfutils on i686-linux fail dwarf validity test: - https://sourceware.org/PR29450 ---- a/gas/dwarf2dbg.c -+++ b/gas/dwarf2dbg.c -@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - { - const char *name; - size_t len; -+ expressionS size = { .X_op = O_constant }; - - /* Skip warning constructs (see above). */ - if (symbol_get_bfdsym (symp)->flags & BSF_WARNING) -@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp)) - continue; - -+#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ -+ size.X_add_number = S_GET_SIZE (symp); -+ if (size.X_add_number == 0 && IS_ELF -+ && symbol_get_obj (symp)->size != NULL) -+ { -+ size.X_op = O_add; -+ size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); -+ } -+#endif -+ if (size.X_op == O_constant && size.X_add_number == 0) -+ continue; -+ - subseg_set (str_seg, 0); - name_sym = symbol_temp_new_now_octets (); - name = S_GET_NAME (symp); -@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - emit_expr (&exp, sizeof_address); - - /* DW_AT_high_pc */ -- exp.X_op = O_constant; --#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ -- exp.X_add_number = S_GET_SIZE (symp); -- if (exp.X_add_number == 0 && IS_ELF -- && symbol_get_obj (symp)->size != NULL) -- { -- exp.X_op = O_add; -- exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); -- } --#else -- exp.X_add_number = 0; --#endif - if (DWARF2_VERSION < 4) - { -- if (exp.X_op == O_constant) -- exp.X_op = O_symbol; -- exp.X_add_symbol = symp; -- emit_expr (&exp, sizeof_address); -+ if (size.X_op == O_constant) -+ size.X_op = O_symbol; -+ size.X_add_symbol = symp; -+ emit_expr (&size, sizeof_address); - } -- else if (exp.X_op == O_constant) -- out_uleb128 (exp.X_add_number); -+ else if (size.X_op == O_constant) -+ out_uleb128 (size.X_add_number); - else -- emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0); -+ emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0); - } - - /* End of children. */ diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index 16737a7b5ee8..dca62b82eead 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -1,45 +1,22 @@ { lib, stdenv -, buildPackages -, gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo -, libiberty, libintl, zlib +, binutils-unwrapped-all-targets }: stdenv.mkDerivation { pname = "libbfd"; - inherit (binutils-unwrapped) version src; + inherit (binutils-unwrapped-all-targets) version; - outputs = [ "out" "dev" ]; - - patches = binutils-unwrapped.patches ++ [ - ./build-components-separately.patch + dontUnpack = true; + dontBuild = true; + dontInstall = true; + propagatedBuildInputs = [ + binutils-unwrapped-all-targets.dev + binutils-unwrapped-all-targets.lib ]; - # We just want to build libbfd - postPatch = '' - cd bfd - ''; - - postAutoreconf = '' - echo "Updating config.guess and config.sub from ${gnu-config}" - cp -f ${gnu-config}/config.{guess,sub} ../ - ''; - - # We update these ourselves - dontUpdateAutotoolsGnuConfigScripts = true; - - strictDeps = true; - nativeBuildInputs = [ autoreconfHook bison texinfo ]; - buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--enable-install-libbfd" - "--with-system-zlib" - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared"; - - enableParallelBuilding = true; + passthru = { + inherit (binutils-unwrapped-all-targets) dev hasPluginAPI; + }; meta = with lib; { description = "A library for manipulating containers of machine code"; diff --git a/pkgs/development/tools/misc/binutils/libopcodes.nix b/pkgs/development/tools/misc/binutils/libopcodes.nix index e4b6cec41b4f..e067282a0e5e 100644 --- a/pkgs/development/tools/misc/binutils/libopcodes.nix +++ b/pkgs/development/tools/misc/binutils/libopcodes.nix @@ -1,38 +1,22 @@ -{ lib, stdenv, buildPackages -, autoreconfHook, bison, binutils-unwrapped -, libiberty, libbfd +{ lib, stdenv +, binutils-unwrapped-all-targets }: stdenv.mkDerivation { pname = "libopcodes"; - inherit (binutils-unwrapped) version src; + inherit (binutils-unwrapped-all-targets) version; - outputs = [ "out" "dev" ]; - - patches = binutils-unwrapped.patches ++ [ - ./build-components-separately.patch + dontUnpack = true; + dontBuild = true; + dontInstall = true; + propagatedBuildInputs = [ + binutils-unwrapped-all-targets.dev + binutils-unwrapped-all-targets.lib ]; - # We just want to build libopcodes - postPatch = '' - cd opcodes - find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"//' \; - ''; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty ]; - # dis-asm.h includes bfd.h - propagatedBuildInputs = [ libbfd ]; - - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--enable-install-libbfd" - "--enable-shared" - ]; - - enableParallelBuilding = true; + passthru = { + inherit (binutils-unwrapped-all-targets) dev hasPluginAPI; + }; meta = with lib; { description = "A library from binutils for manipulating machine code"; diff --git a/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch b/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch new file mode 100644 index 000000000000..562aad33eccd --- /dev/null +++ b/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch @@ -0,0 +1,25 @@ +Avoid `lib -> out -> lib` reference. Normally `bfd-plugins` does not +need to know binutils' BINDIR at all. It's an absolute path where +libraries are stored. +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -493,7 +493,7 @@ build_plugin_list (bfd *abfd) + when configuring binutils using --libdir. Search in the proper + path first, then the old one for backwards compatibility. */ + static const char *path[] +- = { LIBDIR "/bfd-plugins", BINDIR "/../lib/bfd-plugins" }; ++ = { LIBDIR "/bfd-plugins", }; + struct stat last_st; + unsigned int i; + +@@ -508,9 +508,7 @@ build_plugin_list (bfd *abfd) + last_st.st_ino = 0; + for (i = 0; i < sizeof (path) / sizeof (path[0]); i++) + { +- char *plugin_dir = make_relative_prefix (plugin_program_name, +- BINDIR, +- path[i]); ++ char *plugin_dir = xstrdup (path[i]); + if (plugin_dir) + { + struct stat st; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 6fcdb5b753aa..741edcc74871 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23272"; + version = "0.1.23391"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4="; + sha256 = "sha256-mTqrckoYbxtlwonXp6mtbXSpmVB3WfSXaOkyycBVjx0="; }; - vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; + vendorHash = "sha256-7k5jmXvNtxezialavNz8NM7esl2vpXcjRW2n/9GAycs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 6c2799cfadf7..5c7720a2024b 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -36,8 +36,11 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram "$out/bin/runtest" \ - --prefix PATH ":" "${expect}/bin" + # 'runtest' and 'dejagnu' look up 'expect' in their 'bin' path + # first. We avoid use of 'wrapProgram' here because wrapping + # of shell scripts does not preserve argv[0] for schell scripts: + # https://sourceware.org/PR30052#c5 + ln -s ${expect}/bin/expect $out/bin/expect ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 27ff1b5e69dd..b7270f79c431 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -27,10 +27,10 @@ let CXXFLAGS="-O2 -fno-strict-aliasing" --mandir=$out/share/man ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} - ${if static then "LDFLAGS=-static" else ""} - --with${if static == true || popt == null then "" else "out"}-included-popt - --with${if avahi != null then "" else "out"}-avahi - --with${if gtk3 != null then "" else "out"}-gtk + ${lib.optionalString static "LDFLAGS=-static"} + ${lib.withFeature (static == true || popt == null) "included-popt"} + ${lib.withFeature (avahi != null) "avahi"} + ${lib.withFeature (gtk3 != null) "gtk"} --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix index ec65ca62fa30..2203863264f3 100644 --- a/pkgs/development/tools/misc/edb/default.nix +++ b/pkgs/development/tools/misc/edb/default.nix @@ -30,6 +30,8 @@ mkDerivation rec { # Change default optional terminal program path to one that is more likely to work on NixOS. substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + + sed '1i#include ' -i include/{RegisterViewModelBase,State,IState}.h # gcc12 ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 71b0bbd0b0d6..d836e5a973ae 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"; }; + enableParallelBuilding = true; + meta = { description = "Perfect hash function generator"; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 1d25dc8c6e0d..5c54941b9077 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "help2man"; - version = "1.49.2"; + version = "1.49.3"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ni4OITp+CjYkTu1iBNkCtlBGAqV4tuzRUmixRU3q3TY="; + url = "mirror://gnu/help2man/help2man-${version}.tar.xz"; + sha256 = "sha256-TX5P3vLspq/geiaCFRzqeHgeCk6PliIULZ9wwIOi/U8="; }; strictDeps = true; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { "--enable-nls" ]; - doCheck = false; # target `check' is missing + doCheck = false; # target `check' is missing - patches = if stdenv.hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + patches = lib.optional stdenv.hostPlatform.isCygwin ./1.40.4-cygwin-nls.patch; # We don't use makeWrapper here because it uses substitutions our # bootstrap shell can't handle. @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { cat > $out/bin/help2man < 2.0) - mdl (0.11.0) + mdl (0.12.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.2) + mixlib-shellout (3.2.7) chef-utils - rexml (3.2.4) - tomlrb (2.0.0) + rexml (3.2.5) + tomlrb (2.0.3) PLATFORMS ruby @@ -27,4 +29,4 @@ DEPENDENCIES mdl BUNDLED WITH - 2.1.4 + 2.4.6 diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index eaaa7bed5a5e..1fd09e878088 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,13 +1,24 @@ { chef-utils = { + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; + sha256 = "0ckbnra3cs71syrvfhgcrg1icqxh6pj21by2f9sy6r6kbr19g4w3"; type = "gem"; }; - version = "16.7.61"; + version = "18.1.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + type = "gem"; + }; + version = "1.2.0"; }; kramdown = { dependencies = ["rexml"]; @@ -15,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -37,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; + sha256 = "1gk42gayn8d2084ak6wvdwch00wb0acvncglfdhi5n0ap93q6wb6"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; mixlib-cli = { groups = ["default"]; @@ -58,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; type = "gem"; }; - version = "3.0.9"; + version = "3.0.27"; }; mixlib-shellout = { dependencies = ["chef-utils"]; @@ -69,29 +80,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.7"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.3"; }; } diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index ec9fb436f764..39b6baabc836 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.24"; + # Need a revision that supports DW_TAG_unspecified_type(0x3b). + # Was added after 1.24 release in a series of changes. + # Can switch back to release tags once 1.25 is cut. + version = "1.24-unstable-2022-11-24"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; - rev = "v${version}"; - sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg="; + rev = "02d67c51765dfbd5893087da63744c864c7cc9e0"; + hash = "sha256-hKc8UKxPtEM2zlYmolSt1pXJKNRt4wC/Uf+dP/Sb7+s="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 1c049eac7aa3..6eeb47df10ab 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.3"; + version = "2.4.6"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - hash = "sha256-xF87Q1K25/9pUYt660RY2RCIC6u2m2ArBQb2nWhiKvw="; + hash = "sha256-FYLjg4lzr8M22r4yoKfMIAx2HKGi2fcD28AaV1ChkLk="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index f941ab05e288..ae880ceb8ba4 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/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/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 5faccab938ee..de8906dba44b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -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"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 095af7769140..18ea26ca22a8 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -2,13 +2,13 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; - version = "1.2.0-rc"; + version = "1.2.0"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; rev = version; - sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ="; + hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw="; }; nativeBuildInputs = [ ocp-build ]; @@ -19,11 +19,6 @@ with ocamlPackages; buildDunePackage rec { ocp-build -init ''; - postPatch = '' - substituteInPlace src/completion.ml \ - --replace 'LibIndex.load ' 'LibIndex.load ~qualify:false ' - ''; - meta = { homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index b4843ddc1030..10d99906b40c 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.8.0"; + version = "14.2.7"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mplWF/lmgRfYd1Gg2loZI5NIfmTHR8quG1/KcZj5W54="; + hash = "sha256-x+hSsN/STJYbyGRCQJ70T3FMKfe1aJaqiK+KT0eNpwE="; }; - vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; + vendorHash = "sha256-rLPL2kGIPR/paY3mLXsqMgvTe7EgQPmg3EqXrLjlFPk="; 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/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 7a50b2df240c..b9f549693dfe 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-0pnPffvKcBpBir0l6rpp7iVbF9XlMTCG2mifzYkEQ7s="; + hash = "sha256-5HAXcFD53VJ+OpmpStKIazoqztAyeqsdRfJy0ctocEk="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 3b38cc97e6b8..fd8658ad0734 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/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/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix new file mode 100644 index 000000000000..f57d7b137b1a --- /dev/null +++ b/pkgs/development/tools/paging-calculator/default.nix @@ -0,0 +1,31 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "paging-calculator"; + version = "0.1.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-9DbpfJbarWXYGNzTqfHHSaKFqSJ59E/VhOhuMUWk8ho="; + }; + + cargoHash = "sha256-IfOhJwR5eRHeeAbEZ8zeUVojQXtrYHdzAeht/lvdlUQ="; + + meta = { + description = "CLI utility that helps calculating page table indices from a virtual address"; + longDescription = '' + paging-calculator is a CLI utility written in Rust that helps you find the indices that a virtual + address will have on different architectures or paging implementations. + + It takes a (virtual) address in hexadecimal format and shows you which index will be used for + what page-table level. It can be installed with $ cargo install paging-calculator. + ''; + homepage = "https://github.com/phip1611/paging-calculator"; + changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix new file mode 100644 index 000000000000..f379a1ed0517 --- /dev/null +++ b/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/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 13ba669bb4f2..8fcb696ac7f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -60,7 +60,7 @@ let buildGrammar { language = grammar.language or name; inherit version; - src = grammar.src or fetchGrammar grammar; + src = grammar.src or (fetchGrammar grammar); location = grammar.location or null; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 9e792a49733b..9704788141c7 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/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/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index f76e0287b564..ecd80d626049 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; + sha256 = "sha256-KP5Cq6pYKQI5dV6S4lLapu9EcwAgLgYpK0qreNDZink="; }; buildInputs = [ libusb1 pico-sdk ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; - installPhase = '' - runHook preInstall - install -Dm755 ./picotool -t $out/bin - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 2d19f0fca3c3..e347f4c48e05 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/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/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index dd1e2640a528..424e93c9344a 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -151,7 +151,7 @@ let (builtins.filter ({ prefix, path }: "NETRC" == prefix) builtins.nixPath); - netrc_file = if (pathParts != [ ]) then (builtins.head pathParts).path else ""; + netrc_file = lib.optionalString (pathParts != [ ]) (builtins.head pathParts).path; in pkgs.runCommand file { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 36a66d091aeb..60a45f606f6b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -457,9 +457,9 @@ lib.composeManyExtensions [ preConfigure = lib.concatStringsSep "\n" [ (old.preConfigure or "") - (if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' + (lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) '' MACOSX_DEPLOYMENT_TARGET=10.16 - '' else "") + '') ]; preBuild = old.preBuild or "" + '' @@ -720,7 +720,7 @@ lib.composeManyExtensions [ (old.propagatedBuildInputs or [ ]) ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ] ; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + preBuild = lib.optionalString mpiSupport "export CC=${mpi}/bin/mpicc"; HDF5_DIR = "${pkgs.hdf5}"; HDF5_MPI = if mpiSupport then "ON" else "OFF"; # avoid strict pinning of numpy diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 84f1670e6dff..8799fbd62d39 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -19,6 +19,7 @@ let nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12 }; ## a kernel build dir as expected by systemtap diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 6c6e88fc153d..42eec2fa4c93 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/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/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index 948115c332ed..e65ae273b262 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/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/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index d0b0000e59a4..ee5308951577 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "1.10.0"; + version = "1.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; rev = "refs/tags/v${version}"; - hash = "sha256-wb9E1BX9gjejZ5nTudzEPP+suX2eG4MPT07651+OY88="; + hash = "sha256-dS9+S3RogsBlbEHyq5Ll3kGbULwIQHQkwwNjjbsrgio="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 21e77ce5f487..30d4c5a81e26 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.4.2"; + version = "5.4.3"; pname = "rocminfo"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ba799c7267ba..541ce48bdc9a 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.241"; + version = "0.0.244"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yrwrkU19LBM3gac70Y1UamZTdamuJdrMX4U88zGgJJs="; + sha256 = "sha256-oQBNVs7hoiXNqz5lYq5YNKHfpQ/c8LZAvNvtFqpTM2E="; }; - cargoSha256 = "sha256-RzGYh0zspP+sG7k+XwDy9kaTIGIEoOEV3ZoqVf0X0GA="; + cargoSha256 = "sha256-61kypAXWfUZLfTbSp+b0gCKwuWtxAYVtKIwfVOcJ2o8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix new file mode 100644 index 000000000000..5705b9039b7d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -0,0 +1,58 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, xz +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-binstall"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "cargo-bins"; + repo = "cargo-binstall"; + rev = "v${version}"; + hash = "sha256-wM8DawrniyJxj8Omgj+hiePa521p4hIAngfzEHFNO58="; + }; + + cargoHash = "sha256-ZanPmdFMDGZhRHVVGt03OJWz8HnSYFdm42W6rpytu5Y="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + xz + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "fancy-no-backtrace" + "pkg-config" + "rustls" + "trust-dns" + "zstd-thin" + ]; + + # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu + postPatch = '' + rm .cargo/config + ''; + + meta = with lib; { + description = "A tool for installing rust binaries as an alternative to building from source"; + homepage = "https://github.com/cargo-bins/cargo-binstall"; + changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix new file mode 100644 index 000000000000..30a73522c185 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-dist"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "axodotdev"; + repo = "cargo-dist"; + rev = "v${version}"; + hash = "sha256-7/TUk9LGwmHhKwFtwFQM7C/1ItRsoJ4IodeUPWfGjkc="; + }; + + cargoHash = "sha256-vmHPjecd1u0f8wSTu+LE2BNiZlskDADLXNjIj2v7D5E="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + ]; + + meta = with lib; { + description = "A tool for building final distributable artifacts and uploading them to an archive"; + homepage = "https://github.com/axodotdev/cargo-dist"; + changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/RELEASES.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index cf540117f512..b69c7968dcec 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/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/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 359f5dbe64d2..1d59373f30a6 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.17.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4="; + sha256 = "sha256-nxQ060M5TEUMKtJZ1j3A3v3s1cW1mnHy0/2ZXbxoaMc="; }; - cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0="; + cargoSha256 = "sha256-D/rY9d50uKkheEeHe6S04TSdmTyUVgrABIYrFOuZudY="; nativeBuildInputs = [ pkg-config ]; @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires nightly version of cargo-rustdoc - "--skip=dump::tests" "--skip=query::tests" "--skip=verify_binary_contains_lints" + "--skip=rustdoc_cmd::tests" ]; # use system openssl diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 55b63dadad97..a582ce805a91 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.22"; + version = "1.0.23"; src = fetchCrate { inherit pname version; - sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw="; + sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4="; }; - cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U="; + cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; homepage = "https://github.com/dtolnay/cargo-tally"; + changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index af7abb9a1abf..7b0647c14c45 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = "v${version}"; - sha256 = "sha256-FCz15kMSKckifYWSTMGqJbRpZ8X/AM5dSw46dg8ERcY="; + sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc="; }; - cargoSha256 = "sha256-csSUe2qUIN2xKOMHWyM56FZyCwKPdfAI0NrFiDOtRiE="; + cargoSha256 = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 79822a7735e5..02b2ea5430b1 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Sp3PVhUvXn7FzPHHyyRBUHY5TQYEPLFdoI4ARQ4V0k="; + sha256 = "sha256-ITevZv/4Q21y3o9N4WSqD2vONQfNEXKHE/Af/f6T8vw="; }; - cargoSha256 = "sha256-QplcedhsqFiAwcqBrEe2ns4DdZ+R/IuoKtkx8eGk19g="; + cargoSha256 = "sha256-e5MIaX4R/z41x11SyZaiOERokCllC10J+rLra2I1N9c="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 6dd1d5e32bd8..a86867eded08 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/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/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a90ac2780e8a..2f5556ec0a51 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/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-02-06"; + cargoSha256 = "sha256-TYMK905P5FvDxWo3ntDjNsgYxz+tBQptxWh5p6OKE64="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; + sha256 = "sha256-apIUZwMwZkWqd7anSGcI1g+2rYfd5GoxIpFFabUFYBU="; }; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d7c4aaa39eef..6f9466b60d20 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; + sha256 = "sha256-zFdw6P4yrLDshtF9A5MbkxFcUE8KvlZGx5qkW4LSPzw="; }; - cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; + cargoSha256 = "sha256-QJKxKAW7MutpJsJwB/EImQLPaax7L/A25yRAAwEDXUQ="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 0bab699b3cf2..f4fac6644646 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/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/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index f512e48e9109..4e1a51f5154a 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/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/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 08bcde3ae510..f39f7510c1bf 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -12,17 +12,19 @@ , fuse-overlayfs , dockerTools , runCommand +, testers +, skopeo }: buildGoModule rec { pname = "skopeo"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-P556Is03BeC0Tf+kNv+Luy0KASgTXsyZ/MrPaPFUHE8="; + hash = "sha256-wTOcluPSguF6ZnKHlLelM5R2dIF9nd66qu7u/48uNyU="; }; outputs = [ "out" "man" ]; @@ -45,8 +47,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - PREFIX=$out make install-binary install-completions - PREFIX=$man make install-docs + PREFIX=${placeholder "out"} make install-binary install-completions install-docs install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ @@ -60,11 +61,15 @@ buildGoModule rec { install ${src}/default-policy.json -Dt $out ''; tests = { + version = testers.testVersion { + package = skopeo; + }; inherit (dockerTools.examples) testNixFromDockerHub; }; }; meta = with lib; { + changelog = "https://github.com/containers/skopeo/releases/tag/${src.rev}"; description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; maintainers = with maintainers; [ lewo ] ++ teams.podman.members; diff --git a/pkgs/development/tools/squawk/correct-Cargo.lock.patch b/pkgs/development/tools/squawk/correct-Cargo.lock.patch new file mode 100644 index 000000000000..431f004d2d75 --- /dev/null +++ b/pkgs/development/tools/squawk/correct-Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d5803a8..384224d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1585,7 +1585,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] + name = "squawk" +-version = "0.19.0" ++version = "0.20.0" + dependencies = [ + "atty", + "base64 0.12.3", diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix new file mode 100644 index 000000000000..9649625c1737 --- /dev/null +++ b/pkgs/development/tools/squawk/default.nix @@ -0,0 +1,67 @@ +{ darwin +, fetchFromGitHub +, lib +, libiconv +, libpg_query +, openssl +, pkg-config +, rustPlatform +, stdenv +}: +let + # The query parser produces a slightly different AST between major versions + # and Squawk is not capable of handling >=14 correctly yet. + libpg_query13 = libpg_query.overrideAttrs (_: rec { + version = "13-2.2.0"; + src = fetchFromGitHub { + owner = "pganalyze"; + repo = "libpg_query"; + rev = version; + hash = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; + }; + }); +in +rustPlatform.buildRustPackage rec { + pname = "squawk"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "sbdchd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-v9F+HfscX4dIExIP1YvxOldZPPtmxh8lO3SREu6M+C0="; + }; + + cargoHash = "sha256-kSaQxqom8LSCOQBoIZ1iv+q2+Ih8l61L97xXv5c4a0k="; + + cargoPatches = [ + ./correct-Cargo.lock.patch + ]; + + patches = [ + ./fix-postgresql-version-in-snapshot-test.patch + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + libiconv + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Security + ]); + + LIBPG_QUERY_PATH = libpg_query13; + + meta = with lib; { + description = "Linter for PostgreSQL, focused on migrations"; + homepage = "https://squawkhq.com/"; + changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ andrewsmith ]; + }; +} diff --git a/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch new file mode 100644 index 000000000000..205fd3dba973 --- /dev/null +++ b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch @@ -0,0 +1,13 @@ +diff --git a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +index 7273b74..ae94927 100644 +--- a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap ++++ b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +@@ -133,7 +133,7 @@ Ok( + }), + ]), + "version": Number( +- 130003, ++ 130008, + ), + }), + ) diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 6befb42c24d3..977b08602735 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/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/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 19187643d187..60110d6c99f3 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; + sha256 = "sha256-PpkJwCVZr21P1WmU2Kid+X9JwKdJs1krY6keQoMqDvc="; }; - cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; + cargoSha256 = "sha256-oCoE+Fk2zcVlV8H+f/soAWlhXNsLTysmqLXx9yjdnFY="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix new file mode 100644 index 000000000000..c68542978d12 --- /dev/null +++ b/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/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index 14ee825c72c0..11ca370deb62 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.186", + "version": "4.4.245", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-J/VzIxCxttKB4ggLLxyK596k0U1mh6jqaBrzTRxL32Q=" + "hash": "sha256-heumULn4DNYJVB8ZdQz8RcQYcLcdF85+Wjsz4K3SUDg=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-quIINq0ocD5k/KyB/N3yBTqyW3GSljAuoaPp4JNYvMw=" + "hash": "sha256-eLzf2srpOh9YSdl2lK1KALQ/KERIcJJoeErLxeM3J+M=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-lYmKgRi43MDyy7jZn8J/PFHgBE9UdjF1bqx2wrMJ4uU=" + "hash": "sha256-ZCATPu9cU2ZUUFE7vDx/xKyx8jChubrG1xby7I+0z/4=" } } } diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 983e91e62e66..97178734deb7 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.3.3"; + version = "5.4.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-4ZgPytpv2yxKXADGR4I5+U0YjsvGEvcaF0cGrCJ21aI="; + sha256 = "sha256-DSYZUYC4WJiVOtxBWWGV3x/4wxpiJRQsfQYjgfNIj/4="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 87ec2964a00b..eb5c0a6258cc 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/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/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 17e898301956..efc161095580 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , pkg-config +, jq , glslang , libffi , libX11 @@ -37,15 +38,10 @@ stdenv.mkDerivation rec { hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms="; }); - # Include absolute paths to layer libraries in their associated - # layer definition json files. - postPatch = '' - sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt - ''; - nativeBuildInputs = [ cmake pkg-config + jq ]; buildInputs = [ @@ -74,6 +70,15 @@ stdenv.mkDerivation rec { # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER. doCheck = false; + # Include absolute paths to layer libraries in their associated + # layer definition json files. + preFixup = '' + for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do + jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" + mv tmp.json "$f" + done + ''; + meta = with lib; { description = "The official Khronos Vulkan validation layers"; homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"; diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/development/tools/wambo/default.nix new file mode 100644 index 000000000000..f5e277d415ef --- /dev/null +++ b/pkgs/development/tools/wambo/default.nix @@ -0,0 +1,30 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "wambo"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-WZQgQmoFmsWLgPYRWonJmyKq9IIJ+a6J+O19XPppJG4="; + }; + + cargoHash = "sha256-ghUdhWW5gURWxj/OhbcKPNeLzeJvndqAxEZmwKBATUk="; + + meta = { + description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; + longDescription = '' + wambo is a binary that can easily shows you a numeric value in all important numeral systems + (bin, hex, dec) + interprets the input as both signed and unsigned values (from i8 to i64, + including f32 and f64). It also easily calculates you mibibytes to bytes, kilobytes to gibibytes, + and so on. + ''; + homepage = "https://github.com/phip1611/wambo"; + changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 6f5d9162c5b7..077042b1c0ac 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/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/pkgs/development/tools/watchman/Cargo.lock b/pkgs/development/tools/watchman/Cargo.lock new file mode 100644 index 000000000000..9554b7be1f5b --- /dev/null +++ b/pkgs/development/tools/watchman/Cargo.lock @@ -0,0 +1,994 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +dependencies = [ + "const-random", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +dependencies = [ + "serde", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.7.1", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "duct" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +dependencies = [ + "libc", + "once_cell", + "os_pipe", + "shared_child", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jwalk" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dbcda57db8b6dc067e589628b7348639014e793d9e8137d8cf215e8b133a0bd" +dependencies = [ + "crossbeam", + "rayon", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "ntapi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +dependencies = [ + "winapi", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_pipe" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bser" +version = "0.3.1" +dependencies = [ + "anyhow", + "byteorder", + "bytes", + "serde", + "thiserror", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.26.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "tabular" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9a2882c514780a1973df90de9d68adcd8871bacc9a6331c3f28e6d2ff91a3d1" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite", + "slab", + "tokio", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "watchman_client" +version = "0.8.0" +dependencies = [ + "anyhow", + "bytes", + "futures 0.3.25", + "maplit", + "serde", + "serde_bser", + "thiserror", + "tokio", + "tokio-util", + "winapi", +] + +[[package]] +name = "watchmanctl" +version = "0.1.0" +dependencies = [ + "ahash", + "anyhow", + "atty", + "duct", + "jwalk", + "nix", + "serde", + "serde_json", + "structopt", + "sysinfo", + "tabular", + "tokio", + "watchman_client", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 2acbf13e2789..7a042ac8bc73 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,47 +1,107 @@ -{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkg-config, openssl -, confFile ? config.watchman.confFile or null -, withApple ? stdenv.isDarwin, CoreServices +{ boost +, cmake +, config +, CoreServices +, cpptoml +, double-conversion +, edencommon +, ensureNewerSourcesForZipFilesHook +, fb303 +, fbthrift +, fetchFromGitHub +, fizz +, fmt_8 +, folly +, glog +, gtest +, lib +, libevent +, libiconv +, libsodium +, libunwind +, lz4 +, openssl +, pcre +, pkg-config +, python3 +, rustPlatform +, stateDir ? "/tmp" +, stdenv +, wangle +, zlib +, zstd }: stdenv.mkDerivation rec { pname = "watchman"; - version = "4.9.0"; + version = "2023.01.30.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; + sha256 = "sha256-ZtCUlxx3YgfwKa9J8o9GkdkHquJbh+EytLiGNRlABls="; }; - nativeBuildInputs = [ autoconf automake pkg-config libtool ]; - buildInputs = [ pcre openssl ] - ++ lib.optionals withApple [ CoreServices ]; - - configureFlags = [ - "--enable-lenient" - "--enable-conffile=${if confFile == null then "no" else confFile}" - "--with-pcre=yes" - - # For security considerations re: --disable-statedir, see: - # https://github.com/facebook/watchman/issues/178 - "--disable-statedir" + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs + "-DWATCHMAN_STATE_DIR=${stateDir}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; - prePatch = '' - patchShebangs . - ''; + nativeBuildInputs = [ + cmake + pkg-config + ensureNewerSourcesForZipFilesHook + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); - preConfigure = '' - ./autogen.sh + buildInputs = [ + pcre + openssl + python3 + gtest + glog + boost + libevent + fmt_8 + libsodium + zlib + folly + fizz + wangle + fbthrift + fb303 + cpptoml + edencommon + libunwind + double-conversion + lz4 + zstd + libiconv + ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + + cargoRoot = "watchman/cli"; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + patchShebangs . + cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock ''; meta = with lib; { description = "Watches files and takes action when they change"; - homepage = "https://facebook.github.io/watchman"; - maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; linux ++ darwin; - license = licenses.asl20; + homepage = "https://facebook.github.io/watchman"; + maintainers = with maintainers; [ cstrahan kylesferrazza ]; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix new file mode 100644 index 000000000000..3440c0f947e8 --- /dev/null +++ b/pkgs/development/tools/wgo/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wgo"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "bokwoon95"; + repo = "wgo"; + rev = "v${version}"; + hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + }; + + vendorSha256 = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + + ldflags = [ "-s" "-w" ]; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Live reload for Go apps"; + homepage = "https://github.com/bokwoon95/wgo"; + license = licenses.mit; + maintainers = with maintainers; [ bokwoon95 ]; + }; +} + diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index f79c96f54518..5f84e1e01ff0 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/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/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix index 7a5470a33423..4ec4403987a3 100644 --- a/pkgs/development/tools/wlcs/default.nix +++ b/pkgs/development/tools/wlcs/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { wayland ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix new file mode 100644 index 000000000000..0d05ef2577d6 --- /dev/null +++ b/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/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 3af3e43fe21d..6098c50df137 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/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/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 017434134ca1..150278c0ac4d 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/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/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 5441946052b3..94c1cdaa01a9 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, zed }: buildGoModule rec { @@ -18,11 +20,27 @@ buildGoModule rec { 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/pkgs/development/tools/zq/default.nix b/pkgs/development/tools/zq/default.nix deleted file mode 100644 index c62de54360fc..000000000000 --- a/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/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 817e32e4921c..3b294c4c80bd 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.4.0"; + version = "0.5.6"; 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 = "0LEoOwsZrEV819UpdwHaIRk9vT14JMDiXghUMf3fEoY="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "AEo4xXnePlQYTXepwSDUaG8NczPdTCbPGPzxgH+/HHo="; + sha256 = "sE6DnfyPIj/Rpo9+pME87TcBvdxKFP4B7UXPvq4Rars="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "w66xgmVepmC543apTTGLfeV3FMsLiiUpfqzzRhpaNy8="; + sha256 = "VJyv92H18wsp9F3zwu1KwwjNE1qGBCHVj7vnmnb2RbI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "LMutdGNiGp4aLmeqMLk8Pc0xIjqgWPO6GSli1EfTgkY="; + sha256 = "Sdj/hdGaMvqN35N7tnAgvPQPELeW2IHA3uCVyTLYPw0="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4e1563f7716a..7dda8b1e7b3f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WpS1pqy6o8FUWMdJpzG5T8xoCkQZ/SbWI4k9vellVb8="; + sha256 = "sha256-Dg4ZX1CpjZuCXDu3GxbaRIwdhDuJ50j53b6XETfFGAU="; }; - cargoSha256 = "sha256-RVoXHrEWMwuC+nD6ypiZzGsYEr/BFReE67z7gqqDOzA="; + cargoSha256 = "sha256-6V9djLUmPEQDewKEN0ND7zyXSrKdakXZdYSRsyXWNuE="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e12230f4531b..b19e2e7a288c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.451"; + version = "0.0.456"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; + sha256 = "sha256-RKdw8Yk7G1QhtxYyQtaYS1iKECXxD8kEavzRcvPtmdM="; }; - vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; + vendorHash = "sha256-57Ccqiuu2KQWdNqzqrmVXf7KnvjUjB9S1TMnDYu6b/I="; subPackages = [ "." ]; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix new file mode 100644 index 000000000000..71e01aca947e --- /dev/null +++ b/pkgs/development/web/function-runner/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "function-runner"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4uW7gjvQjv10evBeYdRiQFsnA67VAzL74YBNUbVciHg="; + }; + + cargoSha256 = "sha256-EZubfW4PNdBurLk3YJ/BLtDq3zxkQ3YxfWMMBa2TpWU="; + + meta = with lib; { + description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; + homepage = "https://github.com/Shopify/function-runner"; + license = licenses.asl20; + maintainers = with maintainers; [ nintron ]; + }; +} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 1a8b232c2808..6c76811d0c9f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-RI1O10kObIaEjOuUFuAchjIgjrNDKmwRY0+Vep6UT54="; + sha256 = "sha256-0Ow3G0QbKXQSpjLf371CYNxC3XoO5sv1SQD4MlHeOQ4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix index 792eba3978cc..10dd7950f96b 100644 --- a/pkgs/development/web/ihp-new/default.nix +++ b/pkgs/development/web/ihp-new/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ihp-new"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; rev = "v${version}"; - sha256 = "sha256-8RBZn74pMAOHZL1VzO9DeEeDYm5CE1HOobP9e7Ze0Us="; + sha256 = "sha256-LUIC7Olu2qTxZwgkgVpmTgCEQYDlwvLQFQt3Ox/Vm48="; }; dontConfigure = true; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 4563dd7a045a..e7dec1c12f66 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.21.2"; - sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q"; + version = "14.21.3"; + sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index c8241ababc0d..725bbc690df1 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -10,8 +10,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.19.0"; - sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg"; + version = "16.19.1"; + sha256 = "sha256-F/txZAYZgSWzDJTdPRdWIHspdwViav4W2NxHmmWh2LU="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index fa6dcbf28a77..2a5a5ae3f677 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.14.0"; - sha256 = "sha256-Qu+d0xmT1cjoKwqwlpE1CT5qKW76J7G+mvwErADwJno="; + version = "18.14.1"; + sha256 = "sha256-7sNTQ4Jm/QrvU6lEa+ELMu5udNCOMt1UVLOC/2eT2gQ="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index 85739c36c132..f344324291c3 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.6.0"; - sha256 = "sha256-UZxtVCqfmW8AwaPTsuXPUrfbmY2V9s7VqJPRagPeM+o="; + version = "19.6.1"; + sha256 = "sha256-dxDmwoUclWvkkm/CVAZ48/3fjm04Juo6qbjCjW6omps="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index 1542b120c9af..e36521e19149 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/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/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 9523a228f878..ef2f0c69ae60 100644 --- a/pkgs/games/anki/bin.nix +++ b/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/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch deleted file mode 100644 index c8597a0303b8..000000000000 --- a/pkgs/games/beret/use-home-dir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur beret-beret-orig/game.c beret-beret/game.c ---- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 -+++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 -@@ -10,12 +10,10 @@ - #include - #include - #include --#ifdef __APPLE__ - #include - #include - #include - #include --#endif - - #define CAMSCROLL 15 - #define SCR_WIDTH 780 -@@ -88,12 +86,8 @@ - #define DIRSEP "/" - #endif - --#ifdef __APPLE__ --#define SUPPORT_PATH "Library/Application Support/Beret/" --#define RESOURCE_PATH "Beret.app/Contents/Resources/" --#else -+#define SUPPORT_PATH ".beret" - #define RESOURCE_PATH "" --#endif - - #define QUITMOD_WIN KMOD_ALT - #define QUITKEY_WIN SDLK_F4 -@@ -812,7 +806,6 @@ - - int init() { - -- #ifdef __APPLE__ - char filestr[512]; - // Get the home directory of the user. - struct passwd *pwd = getpwuid(getuid()); -@@ -827,9 +820,6 @@ - sprintf(filestr, "%s/saves", support_path); - mkdir(filestr, S_IRWXU); - } -- #else -- sprintf(support_path, ""); -- #endif - - if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { - printf("Error: couldn't initialize SDL\n"); diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 3bf2f884ab36..da84422308cc 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -44,6 +44,11 @@ let "VERSION=${version}" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = common.meta // { maintainers = with lib.maintainers; common.meta.maintainers ++ [ skeidel ]; diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 23eb6e96dcb8..a4943187dd69 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { "-DCMAKE_C_FLAGS=-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index fd8189386e73..8a316438a632 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "chessx"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; - sha256 = "sha256-wadIO3iNvj8LgIzExHTmeXxXnWOI+ViLrdhAlzZ79Jw="; + sha256 = "sha256-ev+tK1CHLFt/RvmzyPVZ2c0nxfRwwb9ke7uTmm7REaM="; }; nativeBuildInputs = [ diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 293811e9b040..81bc6d365a0c 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = "-fpermissive"; - NIX_LDFLAGS = "-ldl"; meta = { homepage = "http://www.bergo.eng.br/eboard/"; diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 40b06d88269b..542b414d8a45 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/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/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index a65ce6bac0db..41dd9625adb8 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -202,7 +202,7 @@ let --run "$out/share/factorio/update-config.sh" \ --argv0 "" \ --add-flags "-c \$HOME/.factorio/config.cfg" \ - ${if mods!=[] then "--add-flags --mod-directory=${modDir}" else ""} + ${lib.optionalString (mods!=[]) "--add-flags --mod-directory=${modDir}"} # TODO Currently, every time a mod is changed/added/removed using the # modlist, a new derivation will take up the entire footprint of the diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index e1b15b6248f4..30ba8eaabe5a 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-86+4rFSvJ3xIVx+qDXZ65TSqIrPkbyoLNo1A+mFPdy8="; + sha256 = "sha256-l7MFvcUOv1jA7moA8VYcaQO15eyK/06x6Jznz5jsNNg="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index bf94dfa067f6..eb39b3e19a71 100644 --- a/pkgs/games/flightgear/default.nix +++ b/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/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 5b4407038015..9f9075d75a4d 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -5,8 +5,7 @@ , doxygen , graphviz , makeWrapper -, cppcheck -, boost16x +, boost17x , SDL2 , python3 , freetype @@ -24,8 +23,8 @@ }: stdenv.mkDerivation rec { - version = "0.4.10.2"; pname = "freeorion"; + version = "0.4.10.2"; src = fetchFromGitHub { owner = "freeorion"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (boost16x.override { enablePython = true; python = python3; }) + (boost17x.override { enablePython = true; python = python3; }) (python3.withPackages (p: with p; [ pycodestyle ])) SDL2 freetype @@ -53,7 +52,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - cppcheck doxygen graphviz makeWrapper @@ -81,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; - homepage = "http://www.freeorion.org"; + homepage = "https://www.freeorion.org/"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ tex ]; diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 785d38a759a0..410228c4f02f 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { ''; makeFlags = [ "build-core" ]; + + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=address" + "-Wno-error=deprecated-declarations" + "-Wno-error=use-after-free" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index c8c0e730f10e..f534f9615473 100644 --- a/pkgs/games/heroic/default.nix +++ b/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/pkgs/games/heroic/package.json b/pkgs/games/heroic/package.json index 77b1702d8793..b5f5e0478fd9 100644 --- a/pkgs/games/heroic/package.json +++ b/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/pkgs/games/heroic/yarn.lock b/pkgs/games/heroic/yarn.lock index 6c4d3f59b766..8e865bd6c9c7 100644 --- a/pkgs/games/heroic/yarn.lock +++ b/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/pkgs/games/heroic/yarn.nix b/pkgs/games/heroic/yarn.nix index d8851bfbfdf0..dd85f32653c8 100644 --- a/pkgs/games/heroic/yarn.nix +++ b/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/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index f8f0d55fb9c3..1eabfe77a7ae 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/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/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index e012886c884d..9d9e4243452c 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -30,11 +30,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = - "-Wno-error=deprecated-declarations" + + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=address" + "-Wno-error=use-after-free" + ] ++ [ + "-Wno-error=deprecated-declarations" # Avoid GL_GLEXT_VERSION double definition " -DNO_SDL_GLEXT" - ; + ]; # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ]; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 8bb2e0d0a6fa..3bc493f5d025 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/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/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index f6de3d57c130..08599cccb212 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less , buildPackages , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 @@ -19,23 +19,14 @@ let binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation rec { - version = "3.6.6"; + version = "3.6.7"; pname = if x11Mode then "nethack-x11" else if qtMode then "nethack-qt" else "nethack"; - patches = [ - # Don't unset `__warn_unused_result__`, breaks on glibc-2.34 - (fetchpatch { - url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch"; - sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY="; - revert = true; - }) - ]; - src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; - sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; + sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI="; }; buildInputs = [ ncurses ] diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b78baee725d4..947b7141b572 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation { fetchurl { inherit url sha256; }; shell = stdenv.shell; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" - else ""; + else lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "x86"; unpackPhase = '' mkdir oilrush cd oilrush diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 389f59f91a6a..8df88c92ff1c 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -63,6 +63,10 @@ mkDerivation rec { }) ]; + postPatch = '' + sed '1i#include ' -i components/myguiplatform/myguidatamanager.cpp # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index d474b0eae92a..10914d410774 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -94,6 +94,11 @@ stdenv.mkDerivation { "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + postUnpack = '' cp -r ${objects-src} $sourceRoot/data/object cp -r ${title-sequences-src} $sourceRoot/data/sequence diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 7aac53ae9403..61c7c0bb866c 100644 --- a/pkgs/games/openttd/default.nix +++ b/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/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index a0c70e463b20..12f4660ba3d4 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/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/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index d22d7fce171f..7a62db1003fa 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "osu-lazer-bin"; - version = "2022.1228.0"; + version = "2023.207.0"; src = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-KDJ6HrnGyM6Brtf66C0r+hbSt/stppe+srChtNSoQ9g="; + sha256 = "sha256-xJQcqNV/Pr3gEGStczc3gv8AYrEKFsAo2g4WtA59fwk="; }; extraPkgs = pkgs: with pkgs; [ icu ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index a633bfb9547b..3a56c35fe88d 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.1228.0"; + version = "2023.207.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-mFgNNt1+fWDfFZcxtwvoIurAhkCGPCDSXMq/lc8qITo="; + sha256 = "sha256-s0gzSfj4+xk3joS7S68ZGjgatiJY2Y1FBCmrhptaWIk="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 863c830e8081..908140259b1e 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -130,10 +130,10 @@ (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.1226.0"; sha256 = "1xjhjcbxqbyfqqsy4dmbxwywwjlp4486r9jzf23kplhc5il5x3qx"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.131.0"; sha256 = "1mbgcg0c8w6114c36jxypz7z1yps5zgw3f2lxw75fra0rylwqm23"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.1221.0"; sha256 = "1hv98hzbzbx4qj1apg7c1vdacaz98q30l8k1n3h6xdqqfn50x8fv"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.202.0"; sha256 = "13apknxly9fqqchmdvkdgfq2jbimln0ixg2d7yn6jcfd235279mj"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.630-alpha"; sha256 = "0jrf70jrz976b49ac0ygfy9qph2w7fnbfrqv0g0x7hlpaip33ra8"; }) (fetchNuGet { pname = "Realm"; version = "10.18.0"; sha256 = "0dzwpcqkp8x8zah1bpx8cf01w4j1vi4gvipmaxlxczrc8p0f9zws"; }) diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 17b63b263029..a3d75bc34aa0 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/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/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 2e9c09bc62e3..522a8e39fd88 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/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/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 2bbbb43c963c..f0d8ea56693b 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "ioquake3"; - version = "unstable-2021-07-20"; + version = "unstable-2022-11-24"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59"; - sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add"; + rev = "70d07d91d62dcdd2f2268d1ac401bfb697b4c991"; + sha256 = "sha256-WDjR0ik+xAs6OA1DNbUGIF1MXSuEoy8nNkPiHaegfF0="; }; nativeBuildInputs = [ which pkg-config ]; @@ -50,10 +50,10 @@ stdenv.mkDerivation { installTargets = [ "copyfiles" ]; - installFlags = [ "COPYDIR=$(out)" ]; + installFlags = [ "COPYDIR=$(out)" "COPYBINDIR=$(out)/bin" ]; preInstall = '' - mkdir -p $out/baseq3 + mkdir -p $out/baseq3 $out/bin ''; meta = with lib; { diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 752181581f38..1b022ff6e14f 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - NIX_CFLAGS_COMPILE = if isMobile then "-DSTYLUS_BASED" else ""; + NIX_CFLAGS_COMPILE = lib.optionalString isMobile "-DSTYLUS_BASED"; buildInputs = [ gtk3 libX11 ]; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 1f051242ad90..cc8b864c1f3e 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -163,7 +163,7 @@ let homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ phile314 ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 614d9823f9ff..7d496a5ec969 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -145,6 +145,9 @@ in buildFHSUserEnv rec { xorg.libXxf86vm libelf + # pressure-vessel (required for mangohud and possibly more) + elfutils.out + # Required glib gtk2 diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 2445ee9096c9..6cb7a23dff5f 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { ./0001-fix-build-with-ffmpeg-4.patch ]; + postPatch = '' + sed '1i#include ' -i src/arch/ArchHooks/ArchHooks.h # gcc12 + ''; + nativeBuildInputs = [ cmake nasm ]; buildInputs = [ diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 679500f974c3..857617bc4bfa 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { sha256 = "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p"; }; + postPatch = '' + sed '1i#include ' -i external/partio_zip/zip_manager.hpp # gcc12 + ''; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix new file mode 100644 index 000000000000..ffc9811e869e --- /dev/null +++ b/pkgs/games/theforceengine/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, libdevil +, rtaudio +, rtmidi +, glew +, alsa-lib +, cmake +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "theforceengine"; + version = "1.09.100"; + + src = fetchFromGitHub { + owner = "luciusDXL"; + repo = "TheForceEngine"; + rev = "v${version}"; + sha256 = "sha256-nw9yp/StaSi5thafVT1V5YA2ZCYGWNoHUvQTpK90Foc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + libdevil + rtaudio + rtmidi + glew + alsa-lib + ]; + + prePatch = '' + # use nix store path instead of hardcoded /usr/share for support data + substituteInPlace TheForceEngine/TFE_FileSystem/paths-posix.cpp \ + --replace "/usr/share" "$out/share" + ''; + + meta = with lib; { + description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future Outlaws."; + homepage = "https://theforceengine.github.io"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ devusb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index b036ded0b74c..7849de17cf6d 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.6"; + version = "4.4.13-gp"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-I4EKYoN+36a65mcZ2UWH3Ws75Ojdmpw/6flKFmEuIk8="; + hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk="; }; 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/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 5a088f34a4ce..98b8917f6e2b 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/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/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index d199918218b3..659d96175d23 100644 --- a/pkgs/games/vassal/default.nix +++ b/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/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 6b5e0c117cc5..75ea0d23e038 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/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/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 3c13fc1a9b78..2c56e0bba4f6 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -12,12 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libX11 libXt libXpm libXaw ]; preConfigure = "autoreconf --install"; - patches = if stdenv.buildPlatform.isDarwin then [ ./darwin.patch ] else []; - configureFlags = - if localStateDir != null then - ["--localstatedir=${localStateDir}"] - else - []; + patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ]; + configureFlags = lib.optionals (localStateDir != null) ["--localstatedir=${localStateDir}"]; meta = with lib; { description = "The falling tower game"; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 737fed1e7f64..e0c2031dde25 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -22,6 +22,9 @@ let url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h"; }; + postPatch = '' + sed '1i#include ' -i zod_src/common.cpp # gcc12 + ''; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +40,7 @@ let hardeningDisable = [ "format" ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; zod_engine = stdenv.mkDerivation { - inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-engine"; enableParallelBuilding = true; preBuild = "cd zod_src"; @@ -48,7 +51,7 @@ let ''; }; zod_map_editor = stdenv.mkDerivation { - inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-map_editor"; enableParallelBuilding = true; preBuild = "cd zod_src"; diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index a5091c525d42..4edd8d0d85b6 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/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/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 334703017478..eaba99839f61 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -23,7 +23,7 @@ # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; - appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; + appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 1542ed14fafe..d2eb7ea3a494 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "5.1.1"; + version = "6.0.3"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-gPToEeLymKIRjL52wb5AjMpDM6vU0Yb0rbcpouev4rQ="; + hash = "sha256-6Qkt7ofNhnqikckUOTaEe5ptsYQ+9ELuuobhfnG7VTU="; # 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, @@ -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/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 03a402225f1b..57baeb7fe828 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/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/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 441f3ccb37f4..fce51aabd263 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -10,6 +10,8 @@ # Extra options , prefix ? "" + +, testers }: with lib; @@ -25,7 +27,7 @@ let optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${prefix}jack2"; version = "1.9.19"; @@ -63,11 +65,14 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH ''); + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "JACK audio connection kit, version 2 with jackdbus"; homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; }; -} +}) diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index ba77e9c3c91a..4e7375a26916 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -2,6 +2,8 @@ # Optional Dependencies , alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null + +, testers }: let @@ -13,12 +15,12 @@ let optLibffado = shouldUsePkg libffado; optCelt = shouldUsePkg celt; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jack1"; version = "0.125.0"; src = fetchurl { - url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -30,11 +32,14 @@ stdenv.mkDerivation rec { buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix index ad6cdf9bfa64..f9ac2181a41c 100644 --- a/pkgs/misc/kitty-themes/default.nix +++ b/pkgs/misc/kitty-themes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2022-08-11"; + version = "unstable-2023-01-08"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = pname; - rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14"; - sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60="; + rev = "e0bb9d751033e82e455bf658744872c83f04b89d"; + sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM="; }; installPhase = '' diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index a2a7e7969166..b5f812d002cc 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/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/pkgs/misc/nflz/default.nix b/pkgs/misc/nflz/default.nix new file mode 100644 index 000000000000..10a87f85b117 --- /dev/null +++ b/pkgs/misc/nflz/default.nix @@ -0,0 +1,34 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "nflz"; + version = "1.0.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; + }; + + cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko="; + + # Tests do not work in the package published on crates.io, since the folder + # with test resources is not packaged. + doCheck = false; + + meta = { + description = "Numbered Files Leading Zeros helps you to manage ascending numbered file names"; + longDescription = '' + CLI to add leading zeros to ascending numbered file names. + NFLZ stands for Numbered Files Leading Zeros. + + This library helps you to manage files inside your file system that + belong to a set of ordered files. An example are photos from a camera. + ''; + homepage = "https://github.com/phip1611/nflz"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 966a451c060c..88ed7a477251 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -59,7 +59,7 @@ # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${lib.optionalString stdenv.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 42d7021f3452..a36005872500 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -92,16 +92,6 @@ let passAsFile = [ "extraConfig" ]; - # Workaround '-idirafter' ordering bug in staging-next: - # https://github.com/NixOS/nixpkgs/pull/210004 - # where libc '-idirafter' gets added after user's idirafter and - # breaks. - # TODO(trofi): remove it in staging once fixed in cc-wrapper. - preConfigure = '' - export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) - export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) - ''; - configurePhase = '' runHook preConfigure diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 9131f66491d5..332577489faf 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - hash = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; + hash = "sha256-vBfD5SQnVx/UqRoyGJc4PINW/wKuHjpiUEz3WiRCR9A="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; + cargoHash = "sha256-xbjUdQs2t+cjplAlNVRN1Zw5CeAYv4+ir4Pvrt+/n9k="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix new file mode 100644 index 000000000000..37440659d7fd --- /dev/null +++ b/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/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 6d1929ef982c..ec98a0b1cfb6 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -41,31 +41,44 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); in lib.makeExtensible (self: { - xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; - xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; - xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; - xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; - xcode_9_3 = requireXcode "9.3" "12m9kb4759s2ky42b1vf7y38qqxn2j99s99adzc6ljnmy26ii12w"; - xcode_9_4 = requireXcode "9.4" "00az1cf9pm8zmvzs6yq04prdmxp8xi3ymxw94jjh4mh7hlbkhcb7"; - xcode_9_4_1 = requireXcode "9.4.1" "0y9kphj86c14jl6aibv57sd7ln0w06vdhzm8ysp0s98rfgyq2lbw"; - xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; - xcode_10_2 = requireXcode "10.2" "1xzybl1gvb3q5qwlwchanzpws4sb70i3plf0vrzvlfdp2hsb3pg7"; - xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; - xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; - xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; - xcode_11_1 = requireXcode "11.1" "1c2gzc4jhhx5a7ncg19sh1r99izhipybaqxl1ll52x5y8689awc1"; - xcode_11_2 = requireXcode "11.2" "1lm3q8zpvm184246h5j9mw4c1y9kk9sxnr3j98kfm0312n0l98gj"; - xcode_11_3 = requireXcode "11.3" "04rv6xlywy8xqfx9ma8ygsdw4yhckk2mq0qnklxnfly899iw4wza"; - xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; - xcode_11_4 = requireXcode "11.4" "065rpb3rdk19nv3rwyf9bk32ccbd0lld12gj12l89cyg65mhpyy7"; - xcode_11_5 = requireXcode "11.5" "1dizazq9nz1vjkc5gy7dd4x760mkfjiifk1hf6d9mscchdq8rfkw"; - xcode_11_6 = requireXcode "11.6" "1y4fhw1kiphzxdb4wpv697z5r0algvaldwq5iqv266797rnfql4x"; - xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj"; - xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z"; - xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0"; - xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; - xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; - xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; + xcode_8_1 = requireXcode "8.1" "sha256-VuAovU/b4rcLh+xMtcsZmbTWwTk35VGfMSp+fqPbsqM="; + xcode_8_2 = requireXcode "8.2" "sha256-ohqgGD7JEEmXEvmfn/N9Ga2lM8jNwhIuh+ky7PQPzY4="; + xcode_9_1 = requireXcode "9.1" "sha256-LG7pVMh1rNh5uP/bASvV9sKvGDrSGWH90J4gzwcgYSk="; + xcode_9_2 = requireXcode "9.2" "sha256-jMiG2G2zoGw4m00CjkGE+2cn0qeOdSUcXosZI2577q0="; + xcode_9_3 = requireXcode "9.3" "sha256-XIQYjfDVSmrYbyolnZIUtmOMhj9uhyWIn0KncsiaqYo="; + xcode_9_4 = requireXcode "9.4" "sha256-ZzE4F4UHVgKlJIn36kfs6Pba8iUAe6P/rh/VmxwLXwE="; + xcode_9_4_1 = requireXcode "9.4.1" "sha256-fFGB/XMZJQ2u9qh+2LYBHFh6mj5lr6gMlSQwgyS8M3k="; + xcode_10_1 = requireXcode "10.1" "sha256-u4Br3SsWbPCv6r4vGHFQUQmfPb9oUEmcdCFktMlbTes="; + xcode_10_2 = requireXcode "10.2" "sha256-592xNBS3Obp/3sDROyI4SxPN77cKMk45Lnis/QJd/vc="; + xcode_10_2_1 = requireXcode "10.2.1" "sha256-r65DbLDpiFJ78VH2hvfp7ZVpehoI44PSnaeDbElZTYc="; + xcode_10_3 = requireXcode "10.3" "sha256-61lDed7/Wi6uVBaj6/fUELISvmH3j69dQE19Y91GwsQ="; + xcode_11 = requireXcode "11" "sha256-EDM5tjuzGTzlVUg6MJKup/Q2OBrFXjzFdXSRO+eQA+Q="; + xcode_11_1 = requireXcode "11.1" "sha256-gXGVkEG+dFEoDbRjtfyN8MeUcoA6hcfsUaVDKAn7T7A="; + xcode_11_2 = requireXcode "11.2" "sha256-8qFEgRVhgOomSnJk23WaM/nACK9JFmiIICjUfT/Co9I="; + xcode_11_3 = requireXcode "11.3" "sha256-6nPCY0rIU2c7nRYDXMWcDHrCm34eqZq6wx157mk3OxM="; + xcode_11_3_1 = requireXcode "11.3.1" "sha256-BI8Olfqyxh51jyNpydiRkPwTQ4OK+ZpHUybPkCSL1tw="; + xcode_11_4 = requireXcode "11.4" "sha256-x/sLazHPs4SoCPKJ0CgFbTEmxlzJeZ7HtinMlse6uRg="; + xcode_11_5 = requireXcode "11.5" "sha256-fLqMcIOM6ZqacTBMF6N0swJzOmnt+FfYlDt8m/BXP7Y="; + xcode_11_6 = requireXcode "11.6" "sha256-nVDsbD7pGCM2jgXzRtV+VIFc/klmX05W6x/eOAOHjvg="; + xcode_11_7 = requireXcode "11.7" "sha256-stKqjXmERNQ4qF/73EE34oLtfF9+WZXK9BwXSVjLQhA="; + xcode_12 = requireXcode "12" "sha256-H8Hcre9dB2v2VT8/SrEkU+RZ2rZRiM0JqMX6i4yoffA="; + xcode_12_0_1 = requireXcode "12.0.1" "sha256-gK7PZ22aR3ow72pSjr7tUIOsgoAEUqcMZgNCEFVp29w="; + xcode_12_1 = requireXcode "12.1" "sha256-l4+MW8IWMqR/9dxd9FVtfxJs3M/qtIcj6nyQ2cjxLfI="; + xcode_12_2 = requireXcode "12.2" "sha256-G8jku/9WB8Q1zgKWGbSv06bSWE385sPlc7xnfonjIJ4="; + xcode_12_3 = requireXcode "12.3" "sha256-CYU2fAeT+DWiK/mpRoGv57RjGfseL23BDU57SokPjk8="; + xcode_12_4 = requireXcode "12.4" "sha256-Qw4j+XFry85/AviHQVhjjjKLAfmRNNwMGN5G8FheJwQ="; + xcode_12_5 = requireXcode "12.5" "sha256-xiGffnV0P9Ojd6IrJSXILUX4oznPif7zm00WAksn3qU="; + xcode_12_5_1 = requireXcode "12.5.1" "sha256-zL0kS86ZzBkIrKLPKvWguDvXj9Tqbr7uR/VZaT/uZ9A="; + xcode_13 = requireXcode "13" "sha256-uTY6d5DBu4OOQLkxs3ExDfLXh50rE2LLlqtCbk3Qn6E="; + xcode_13_1 = requireXcode "13.1" "sha256-vd+4eFVaAyvXsdaExcfbDZSXOwkpt+rEbkBYSMjdUEA="; + xcode_13_2 = requireXcode "13.2" "sha256-guJXm/QnMfvUZwAcJwoy0QeO+DpDcUhs8AxVKvm9tYQ="; + xcode_13_2_1 = requireXcode "13.2.1" "sha256-r832Uu+Q8utK4zN0CtwiMCvMYT5HstWInyq4cNIaZJM="; + xcode_13_3 = requireXcode "13.3" "sha256-p2zaWMpmUeNHQtYOOaVdhCt3cgapvzL3l73/J+UwzCE="; + xcode_13_3_1 = requireXcode "13.3.1" "sha256-j71vpJVJpyj/IOlL+4+5lYgOlhf/zn+7ExIHbxL51cQ="; + xcode_13_4 = requireXcode "13.4" "sha256-IY1coss90GlBeJg/HQPMU8v2rOOxsqlY5q+2Qxe8nnY="; + xcode_13_4_1 = requireXcode "13.4.1" "sha256-Jk8fLgvnODoIhuVJqfV0KrpBBL40fRrHJbFmm44NRKE="; + xcode_14 = requireXcode "14" "sha256-E+wjPgQx/lbYAsauksdmGsygL5VPBA8R9pHB93eA7T0="; + xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index db8ede6feb81..560f2bf30147 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -3,15 +3,16 @@ , fetchurl , alsa-topology-conf , alsa-ucm-conf +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; - version = "1.2.7.2"; + version = "1.2.8"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; + url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-GrAbdOM0JcqZwuNsCET9aIgnMZO9iYJA/o+TrMvL80c="; }; patches = [ @@ -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/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index 512fe605b6e5..4568ecf1e7a8 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.7.1"; + version = "1.2.8"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-rFsqEnV4Pv8H4cs0w2xsWYd0JnmjQAN1B8BKncHSLKw="; + hash = "sha256-/uSnN4MP0l+WnYPaRqKyMb6whu/ZZvzAfSJeeCMmCug="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 2a98aa82ebbd..9c41a217badc 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation rec { systemd ]; + # Flag needed by GCC 12 but unrecognized by GCC 9 (aarch64-linux default now) + NIX_CFLAGS_COMPILE = lib.optionals (with stdenv; cc.isGNU && lib.versionAtLeast cc.version "12") [ + "-Wno-error=mismatched-new-delete" + ]; + patchPhase = '' patchShebangs scripts diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 47f76649dea9..808d1bc42376 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "atop"; - version = "2.7.1"; + version = "2.8.1"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "sha256-ykjS8X4HHe6tXm6cyeOIv2oycNaV5hl2s3lNTZJ7XE4="; + sha256 = "sha256-lwBYoZt5w0RPlx+FRXKg5jiR3C1fcDf/g3VwhUzg2h4="; }; nativeBuildInputs = lib.optionals withAtopgpu [ diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 886bf3e6fee8..8312d64acddc 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { preBuild = '' substituteInPlace Makefile \ - --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \ --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 583bd4115ac5..c6bf684f7fc8 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -10,24 +10,17 @@ , bash , kmod , binutils -, busybox , bzip2 , coreutils , cpio , findutils -, glibc , gnugrep , gnused , gnutar , gzip -, kbd -, lvm2 , lz4 , lzop -, procps -, rng-tools , squashfsTools -, systemd , util-linux , xz , zstd @@ -76,23 +69,16 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ coreutils util-linux - ]} --prefix DRACUT_PATH : ${lib.makeBinPath [ + ]} --suffix DRACUT_PATH : ${lib.makeBinPath [ bash binutils coreutils findutils - glibc gnugrep gnused gnutar - kbd - lvm2 - procps - rng-tools - squashfsTools - systemd + stdenv.cc.libc # for ldd command util-linux - busybox ]} wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [ coreutils diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index e882ddd69b43..a2229a0a60ce 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -33,5 +33,8 @@ stdenvNoCC.mkDerivation rec { priority = 6; # give precedence to kernel firmware }; - passthru = { inherit version; }; + passthru = { + inherit version; + updateScript = ./update.sh; + }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 8fb826833704..d7a13faf4a0b 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.364"; + version = "0.366"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-9fGYoyj7vN3j72H+6jv/R0MaWPZ+4UNQhCSWnZRZZS4="; + sha256 = "sha256-Qn5fx4EiE4bGmPaMcB3ne0wS5ZRRgZC+cYEH5HCRQ7g="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index a116aef7920a..6aa369e4eb4a 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.15"; + version = "7.17"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ClVFqq22QBQsH4iNNmp43fhyR5mWf6IGhqcAU71iF1E="; + sha256 = "sha256-vknJ/0id1mEMrWVB50PDOE6slunyRwfaezkp2PKsZNg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 34fbde9d676a..a64787cac1eb 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,11 +1,8 @@ { stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header -, bison ? null, flex ? null, python ? null, rsync ? null +, bison, flex, rsync , writeTextFile }: -assert stdenvNoCC.hostPlatform.isAndroid -> - (flex != null && bison != null && python != null && rsync != null); - let # As part of building a hostPlatform=mips kernel, Linux creates and runs a @@ -50,7 +47,7 @@ let nativeBuildInputs = [ perl elf-header ] ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [ - flex bison python rsync + bison flex rsync ] ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin && stdenvNoCC.hostPlatform.isMips) [ darwin-endian-h diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 20679b3c9514..78fe1ad0b993 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -70,12 +70,22 @@ let PM_ADVANCED_DEBUG = yes; PM_WAKELOCKS = yes; POWERCAP = yes; + # ACPI Firmware Performance Data Table Support + ACPI_FPDT = whenAtLeast "5.12" yes; + # ACPI Heterogeneous Memory Attribute Table Support + ACPI_HMAT = whenAtLeast "5.2" yes; + # ACPI Platform Error Interface + ACPI_APEI = yes; + # APEI Generic Hardware Error Source + ACPI_APEI_GHES = yes; } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; + # Intel DPTF (Dynamic Platform and Thermal Framework) Support + ACPI_DPTF = whenAtLeast "5.10" yes; }; external-firmware = { diff --git a/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch new file mode 100644 index 000000000000..2b59a508fdac --- /dev/null +++ b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch @@ -0,0 +1,87 @@ +From 1640688018f329559c61352646f283f98938af31 Mon Sep 17 00:00:00 2001 +From: Cole Helbling +Date: Thu, 16 Feb 2023 09:30:21 -0800 +Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed" + +This reverts commit 425c9bd06b7a70796d880828d15c11321bdfb76d. + +Some Equinix Metal instances, such as a3.large.x86, m3.large.x86 +(specific hardware revisions), and n3.large.x86, use the `ice` kernel +driver for their network cards, in conjunction with bonded devices. +However, this commit caused a regression where these bonded devices +would deadlock. This was initially reported by Jaroslav Pulchart on +the netdev mailing list[1], and there were follow-up patches from Dave +Ertman[2][3] that attempted to fix this but were not up to snuff for +various reasons[4]. + +Specifically, v2 of the patch ([3]) appears to fix the issue on some +devices (tested with 8086:159B network cards), while it is still broken +on others (such as an 8086:1593 network card). + +We revert the patch exposing the issue until upstream has a working +solution in order to make Equinix Metal instances work reliably again. + +[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/ +[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/ +[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/ +[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c +--- + drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c +index c5971a840b87..911902d2b93e 100644 +--- a/drivers/infiniband/hw/irdma/verbs.c ++++ b/drivers/infiniband/hw/irdma/verbs.c +@@ -60,6 +60,36 @@ static int irdma_query_device(struct ib_device *ibdev, + return 0; + } + ++/** ++ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed ++ * @link_speed: netdev phy link speed ++ * @active_speed: IB port speed ++ * @active_width: IB port width ++ */ ++static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed, ++ u8 *active_width) ++{ ++ if (link_speed <= SPEED_1000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_SDR; ++ } else if (link_speed <= SPEED_10000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_FDR10; ++ } else if (link_speed <= SPEED_20000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_DDR; ++ } else if (link_speed <= SPEED_25000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_EDR; ++ } else if (link_speed <= SPEED_40000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_FDR10; ++ } else { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_EDR; ++ } ++} ++ + /** + * irdma_query_port - get port attributes + * @ibdev: device pointer from stack +@@ -87,9 +117,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port, + props->state = IB_PORT_DOWN; + props->phys_state = IB_PORT_PHYS_STATE_DISABLED; + } +- +- ib_get_eth_speed(ibdev, port, &props->active_speed, +- &props->active_width); ++ irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed, ++ &props->active_width); + + if (rdma_protocol_roce(ibdev, 1)) { + props->gid_tbl_len = 32; +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 198cd8681646..efc64e81af55 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -65,8 +65,8 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. GCC_PLUGIN_LATENT_ENTROPY = yes; - GCC_PLUGIN_STRUCTLEAK = yes; # A port of the PaX structleak plugin - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = yes; # Also cover structs passed by address + GCC_PLUGIN_STRUCTLEAK = option yes; # A port of the PaX structleak plugin + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = option yes; # Also cover structs passed by address GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a2cace8bc1e4..5bc0f53c4684 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.304-hardened1.patch", - "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" + "name": "linux-hardened-4.14.305-hardened1.patch", + "sha256": "05zcfy7dh8vlbvf9iw99m2xi7d9df254lg3a77hhb8cb264yn6z0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.305-hardened1/linux-hardened-4.14.305-hardened1.patch" }, - "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", - "version": "4.14.304" + "sha256": "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3", + "version": "4.14.305" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.271-hardened1.patch", - "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" + "name": "linux-hardened-4.19.272-hardened1.patch", + "sha256": "1qimbp19mimy6dqv4rc8hb6966sq7l1y72hp0s0vy682qx556zwg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.272-hardened1/linux-hardened-4.19.272-hardened1.patch" }, - "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", - "version": "4.19.271" + "sha256": "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8", + "version": "4.19.272" }, "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.167-hardened1.patch", + "sha256": "0i74kjzilsgyjidz7p9jjxpjx3yqx5gsh7nwlw6zclxg1a82fw24", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.167-hardened1/linux-hardened-5.10.167-hardened1.patch" }, - "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", - "version": "5.10.165" + "sha256": "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq", + "version": "5.10.167" }, "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.93-hardened1.patch", + "sha256": "093a6qpiws4v8pzld6r92dczwvslrp8f2xrpb29qrp37i3kny5si", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.93-hardened1/linux-hardened-5.15.93-hardened1.patch" }, - "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", - "version": "5.15.90" + "sha256": "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7", + "version": "5.15.93" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.230-hardened1.patch", - "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" + "name": "linux-hardened-5.4.231-hardened1.patch", + "sha256": "1fximwmcp0205i3jxmglf0jawgy1knrc9cnjpz05am8yi7ndikmd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.231-hardened1/linux-hardened-5.4.231-hardened1.patch" }, - "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", - "version": "5.4.230" + "sha256": "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d", + "version": "5.4.231" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.8-hardened1.patch", - "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" + "name": "linux-hardened-6.1.11-hardened1.patch", + "sha256": "1pydcjy2cjnb4zxcqr41hr34fg8alph314xasdsfvdw4zaz55s6h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.11-hardened1/linux-hardened-6.1.11-hardened1.patch" }, - "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", - "version": "6.1.8" + "sha256": "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq", + "version": "6.1.11" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3e5cc009576e..06866be49e84 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with 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/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 506d57d79713..11a8c11f3f29 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.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/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b2a9f27947c3..8843f6622ace 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.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/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 9ae7546f3c9d..394883e2de1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.91"; + version = "5.15.94"; # 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 = "0wjsqvhp0jnisypb8yw6dncyp5k7zxbhjivh7jqivpsdwvdp14ns"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index aef87aaa4211..42c5997f22fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.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/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 2bed730a8b11..4c7249f2b4c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.9"; + version = "6.1.12"; # 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 = "1spdl3i69qwn7cywzs6kql8nlisdnmnwk9za7v4xq1092xsscynl"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 698ca10016ca..7e3ffb4720a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19027"; - sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; + rev = "19049"; + sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 15ddf9df9147..9197f7d24827 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.86-rt56"; # updated by ./update-rt.sh + version = "5.15.93-rt58"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; + sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs"; + sha256 = "10xx70qf6nph3223yh6sc5jcyy938qrfdilli2a4zzhp0ibgp8bz"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 310178b9a1fd..18c32930f368 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -57,8 +57,12 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = [ perl libelf ] - ++ optional (lib.versionAtLeast version "5.13") zstd; + moduleBuildDependencies = [ + perl + libelf + # module makefiles often run uname commands to find out the kernel version + (buildPackages.deterministic-uname.override { inherit modDirVersion; }) + ] ++ optional (lib.versionAtLeast version "5.13") zstd; drvAttrs = config_: kernelConf: kernelPatches: configfile: let diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f941ca9f007a..5912abf4181d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,9 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + fix-em-ice-bonding = { + name = "fix-em-ice-bonding"; + patch = ./fix-em-ice-bonding.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 35cb84e07749..2745cd780fce 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/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.12"; #zen suffix = "zen1"; #zen - sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen + sha256 = "16g0rkgmxbj4425mbnadam7vbd8621ar13ddx26j298bc9m8yqic"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.9"; #lqx + version = "6.1.12"; #lqx suffix = "lqx1"; #lqx - sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx + sha256 = "0a6slrydf47hk4b3xlxycjw9y2xgjgvzjic2psbcb1c5y75zq720"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index 5a58c198c0e4..56cfb8ef9c21 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/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/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/os-specific/linux/libzbd/default.nix index f058e09bbd2c..c5d8e9cf80a4 100644 --- a/pkgs/os-specific/linux/libzbd/default.nix +++ b/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/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 3683522f04f9..83ad98d1b1d2 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20221108"; + version = "20230214"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-JZbBrD3fHgJogDw4u2YggDX7OCXCu5/XEZKzHuVJR9k="; + hash = "sha256-SwdE1c7OEg5nncs5QqaTKCL77KddeHw7ZilctQ4L9RA="; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 925901d22676..efde55d651c3 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-11-09"; + version = "unstable-2023-02-09"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; - sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; + passthru.rev = "d4c2910981ff99b983734426dfa99632fb81ac6b"; + sha256 = "926iFpZ6CqDw4n6YSrrnCm3Mu9F3wb3riqYH8mHZ2b4="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c8ed8283ab35..7a0fabf9d468 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -94,12 +94,11 @@ stdenv.mkDerivation rec { NIX_DONT_SET_RPATH = true; preBuild = '' - ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + ${lib.optionalString (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) "# the -x c flag is required since the file extension confuses gcc # that detect the file as a linker script. $CC -x c -c ${stack_chk_fail_local_c} -o __stack_chk_fail_local.o $AR r libssp_nonshared.a __stack_chk_fail_local.o" - else "" } ''; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index ee29180a8d9d..17d0c6938206 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { version = mxu_version + "-${kernel.version}"; + nativeBuildInputs = kernel.moduleBuildDependencies; + preBuild = '' - sed -i -e "s/\$(uname -r).*/${kernel.modDirVersion}/g" driver/mxconf - sed -i -e "s/\$(shell uname -r).*/${kernel.modDirVersion}/g" driver/Makefile sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index df9aca8e2461..40ac5eb65b57 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,11 +25,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "525.85.05"; - sha256_64bit = "sha256-6mO0JTQDsiS7cxOol3qSDf6dID1mHdX2/CZYWnAXkUA="; - openSha256 = "sha256-iI41eex/pQhWdQwk9qc9AlnVYcO0HRA9ISoqNdVKN7g="; - settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; - persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + version = "525.89.02"; + sha256_64bit = "sha256-DkEsiMW9mPhCqDmm9kYU8g5MCVDvfP+xKxWKcWM1k+k="; + openSha256 = "sha256-MP9ir0Fuodar239r3PbqVxIHd0vHvpDj8Rw55TeFtZM="; + settingsSha256 = "sha256-7rHaJWm0XHJXsKL8VnU9XT15t/DU8jdsCXQwQT+KaV0="; + persistencedSha256 = "sha256-4AmOL6b3GKCjGs6bRDpQAkEG4n41X395znyQF1x9VEs="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 884ccdd6c52d..5570228d78bf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/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/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 8d7f2b527144..976c5f1779d7 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -42,6 +42,11 @@ let python3 ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=maybe-uninitialized" + ]; + meta = with lib; { homepage = "https://github.com/ClusterLabs/resource-agents"; description = "Combined repository of OCF agents from the RHCS and Linux-HA projects"; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 3aeef4625562..7cb364597bb6 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { autoreconfHook pkg-config ]; + buildInputs = [ dpdk_19_11 libconfig @@ -38,6 +39,12 @@ in stdenv.mkDerivation rec { libbpf ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + "-Wno-error=uninitialized" + ]; + # binaries will segfault otherwise dontStrip = true; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index bca58bd808eb..b5f9d8a0a2c2 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { s,/etc/pcmcia,$out&,; " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' - + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts") + + (lib.optionalString (firmware == []) ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'') + + (lib.optionalString (configOpts != null) "ln -sf ${configOpts} ./config/config.opts") ; makeFlags = [ "LEX=flex" ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 20db1cdd74f9..60a55096b446 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { RTE_SDK = dpdk; GUI = lib.optionalString withGtk "true"; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=address" + "-Wno-error=use-after-free" + ]; + # requires symbols from this file NIX_LDFLAGS = "-lrte_net_bond"; diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 63de7453935c..ecb0fe535d35 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -13,6 +13,10 @@ mkDerivation rec { sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg="; }; + postPatch = '' + sed '1i#include ' -i src/device.h # gcc12 + ''; + buildInputs = [ qtbase qtgraphicaleffects ]; nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 5e956f3baf34..6fc6e0012b31 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.15.25"; + version = "0.19.11"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; + hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/os-specific/linux/rt-tests/default.nix index 67000776256c..6185bf9912dd 100644 --- a/pkgs/os-specific/linux/rt-tests/default.nix +++ b/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/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 0f2e00c8382f..ecfd6a87e6b4 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; @@ -30,9 +29,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ bc ]; - - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; preInstall = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index e50129f1e2b9..a89eb3702e8b 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" - substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" substituteInPlace ./Makefile --replace /sbin/depmod \# substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index 4aa408eec414..be4b954c1b61 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -13,8 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" @@ -25,7 +24,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace "/sbin/depmod" "#" \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 84ad6a314e15..bd682ec5933d 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -11,21 +11,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" - "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index dd0b32c53801..d8825f018979 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 6a0da0c5e19b..7ba338d37859 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-wx7xQBCfLu3UWB7ghp8dZ7OB2MFd5i8X0/ygyvW2K50="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" - "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -30,7 +28,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 674af264c39c..476bce22fb11 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index edc2d5bc44c0..35b068fd8d08 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 38ded6041f59..d3560aca91ad 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 80c14a0b3834..a2f7ca0e815d 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -14,14 +14,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 35a0355c0bc4..2e554a0241b2 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/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/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e871d6618c34..b03f3c3c16c6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -131,7 +131,7 @@ assert withHomed -> withCryptsetup; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "252.4"; + version = "252.5"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -148,7 +148,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-8ejSEt3QyCSARGGVbXWac2dB9jdUpC4eX2rN0iENQX0="; + hash = "sha256-cNZRTuYFMR1z6KpELeQoJahMhRl4fKuRuc3xXH3KzlM="; }; # On major changes, or when otherwise required, you *must* reformat the patches, diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index f743b0024846..e492bc2403fd 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/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/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index 162ae766a845..73c579288bca 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/modinfo "${kmod}/bin/modinfo" \ --replace 'test -z "$(DESTDIR)"' "0" for module in "vmmon-only" "vmnet-only"; do substituteInPlace "./$module/Makefile" \ --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /bin/grep "${gnugrep}/bin/grep" done ''; diff --git a/pkgs/os-specific/solo5/0001-Fix-test.patch b/pkgs/os-specific/solo5/0001-Fix-test.patch new file mode 100644 index 000000000000..bd01c129bec2 --- /dev/null +++ b/pkgs/os-specific/solo5/0001-Fix-test.patch @@ -0,0 +1,25 @@ +From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001 +From: Lana Black +Date: Sat, 11 Feb 2023 11:53:21 +0000 +Subject: [PATCH] Fix test. + +--- + tests/tests.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tests.bats b/tests/tests.bats +index c542b7a..98520ee 100644 +--- a/tests/tests.bats ++++ b/tests/tests.bats +@@ -196,7 +196,7 @@ xen_expect_abort() { + run test_hello/test_hello.hvt + case "${CONFIG_HOST}" in + Linux) +- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]] ++ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]]) + ;; + FreeBSD) + # XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not +-- +2.39.0 + diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index c449e46a998e..c436f247866f 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; + patches = [ ./0001-Fix-test.patch ]; + hardeningEnable = [ "pie" ]; configurePhase = '' diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index bf1e73f67b9a..091897b69343 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") + (lib.optionalString unicode "--enable-unicode") "--with-opengl" ]; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index a54b5a23cdf1..cb84adf1e780 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-ZhezLVn4PHPAnKCjlR9zI4zt9eJZYIUUODjS01M7q1E="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-sfEnGeWjqCjjZSUUVMi5tsqXdrkCPXrg7Xpi8jTmjLU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-Vfu/mCR1rMBtYMsm/l5cfIwBnNNeJ7G0pC42rLdqWOk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-htHUgx/A+AOhlbEjK5tEvJ0GbC/GsEUz/N2x9Wfyr5o="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-1pgGKUE9hHFGPNAOYNEM0VTYBDdmcrXyJjcT9ymyyiM="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-VzPxraAqmTp6c9OFw3VbpcpzRVkAxiaOlA/eQT7z/js="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-ApCBjbhfoGYm0rmjQ8U1zA/VHNJgC1kBlk5DvmQ6wTc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-cQMKUL5RT+CJiCwXnOPc9o0AwDmo0Z6X8L8TjWTKwpY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-TixmsB8ZmevQB/ZK7NhtZGchDm+r8XRkCR7qiaUTKLE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_arm64.tar.gz"; +}; +armv6l-linux = fetchurl { + sha256 = "sha256-OUvxgvF8qtLuFVuhLYEL7HipcTZrpuYxp8u7uroaUMc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-okhx2mOIBzJevugpcUh12D85WATV7iCqiiOuvOgUezI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 867ba69077f1..3345619bc9aa 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.23"; + version = "0.107.24"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 14; + schema_version = 16; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 8a72bd5a7c99..b7defa8113fa 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -22,6 +22,8 @@ declare -A systems systems[linux_386]=i686-linux systems[linux_amd64]=x86_64-linux systems[linux_arm64]=aarch64-linux +systems[linux_armv6]=armv6l-linux +systems[linux_armv7]=armv7l-linux systems[darwin_amd64]=x86_64-darwin systems[darwin_arm64]=aarch64-darwin @@ -30,7 +32,7 @@ echo '{' >> "$bins" for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do url="$(jq -r '.browser_download_url' <<< "$asset")" - adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" + adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)" if [ -n "$adg_system" ]; then fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" nix_system=${systems[$adg_system]} diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 9b75d1e0dbcf..40c267b00ef6 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "admin-fe"; - version = "unstable-2022-09-10"; + version = "unstable-2023-02-11"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad"; - hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk="; + rev = "130c17808bc50269f8444612f4ab378a08cd5e43"; + hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM="; }; patches = [ ./deps.patch ]; diff --git a/pkgs/servers/akkoma/pleroma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix similarity index 81% rename from pkgs/servers/akkoma/pleroma-fe/default.nix rename to pkgs/servers/akkoma/akkoma-fe/default.nix index 71f3bcd8aee2..a1f2c43d79ee 100644 --- a/pkgs/servers/akkoma/pleroma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -6,20 +6,20 @@ }: stdenv.mkDerivation rec { - pname = "pleroma-fe"; - version = "unstable-2022-12-10"; + pname = "akkoma-fe"; + version = "unstable-2023-02-11"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; - repo = "pleroma-fe"; - rev = "9c9b4cc07c018a21c8261dd7680a97aa3a670756"; - hash = "sha256-jYJcG2Q5kxOH29G5WV/6Cx7a+b7FuFROEn/8ruh7cDc="; + repo = "akkoma-fe"; + rev = "8569b5946eebdb4e7c91252e1dcf88795c8e2538"; + hash = "sha256-fIkfKAFrcCioma3Hb0c20rfSWXevwWeJbyJm+dUSNlQ="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-pz6NHBYZRi+Rwx6H74895vFWGLSivI7Ul8XV6wMbgJg="; + hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho="; }; nativeBuildInputs = [ @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Frontend for Akkoma and Pleroma"; - homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/"; + description = "Frontend for Akkoma"; + homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; license = licenses.agpl3; maintainers = with maintainers; [ mvs ]; }; diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 5df95623dad4..2b2e73e31c26 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -9,14 +9,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; rev = "v${version}"; - hash = "sha256-Apt+6nI4zOCyRb5msPt5UF9vyaendyaOjrYBMl0DqRY="; + hash = "sha256-Ovi2AnfkeCDlv3INomPxu8R1ARexOzZHC8dOLucrDaQ="; }; postPatch = '' @@ -52,24 +52,16 @@ beamPackages.mixRelease rec { sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; }; }; - crypt = beamPackages.buildRebar3 rec { - name = "crypt"; - version = "0.4.3"; + credo = beamPackages.buildMix rec { + name = "credo"; + version = "1.7.0-dev"; src = fetchFromGitHub { - owner = "msantos"; - repo = "crypt"; - rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; - sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; + owner = "rrrene"; + repo = "credo"; + rev = "1c1b99ea41a457761383d81aaf6a606913996fe7"; + hash = "sha256-NdOg6p2J1D8VGGWabAMLs/qRVbi4BzN2DTHci++dJnA="; }; - - buildInputs = [ libxcrypt ]; - - postInstall = '' - mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so - ''; - - beamDeps = with final; [ elixir_make ]; }; elasticsearch = beamPackages.buildMix rec { name = "elasticsearch"; @@ -83,17 +75,6 @@ beamPackages.mixRelease rec { hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; }; }; - gettext = beamPackages.buildMix { - name = "gettext"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "tusooa"; - repo = "gettext"; - rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; - hash = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; - }; - }; linkify = beamPackages.buildMix rec { name = "linkify"; version = "0.5.2"; @@ -120,20 +101,6 @@ beamPackages.mixRelease rec { beamDeps = with final; [ phoenix_view temple ]; }; - remote_ip = beamPackages.buildMix rec { - name = "remote_ip"; - version = "0.1.5"; - - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "remote_ip"; - rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"; - sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6"; - }; - beamDeps = with final; [ combine plug inet_cidr ]; - }; search_parser = beamPackages.buildMix rec { name = "search_parser"; version = "0.1.0"; diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix index f26d96c0f216..27d88ec7b9e6 100644 --- a/pkgs/servers/akkoma/mix.nix +++ b/pkgs/servers/akkoma/mix.nix @@ -8,6 +8,19 @@ let self = packages // (overrides self packages); packages = with beamPackages; with self; { + argon2_elixir = buildMix rec { + name = "argon2_elixir"; + version = "3.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb"; + }; + + beamDeps = [ comeonin elixir_make ]; + }; + base62 = buildMix rec { name = "base62"; version = "1.2.2"; @@ -75,12 +88,12 @@ let cachex = buildMix rec { name = "cachex"; - version = "3.4.0"; + version = "3.5.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1rfbbij81zmk6p75z33wg04mfcjqsxzzh67vclllvfjgmfqj609p"; + sha256 = "0jdh08np2d85h57s6718jb5xzjkc882g9knd12xgzn8d43xfphps"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -101,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.19"; + version = "0.1.20"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0291pdk3x7qzbv8laris1y90vi7g9akmykd23m2fz0nwlmhh2vp9"; + sha256 = "12n9bb4v9b9sx9xk11k98s4f4a532dmmn0x4ak28dj990mjvf850"; }; beamDeps = []; @@ -229,19 +242,6 @@ let beamDeps = []; }; - credo = buildMix rec { - name = "credo"; - version = "1.6.7"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; - }; - - beamDeps = [ bunt file_system jason ]; - }; - custom_base = buildMix rec { name = "custom_base"; version = "0.2.1"; @@ -294,14 +294,27 @@ let beamDeps = []; }; - earmark = buildMix rec { - name = "earmark"; - version = "1.4.33"; + dialyxir = buildMix rec { + name = "dialyxir"; + version = "1.2.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "01mfb0c1vq72pira1622cmvaly2p6n4dxwmsrw10i9x0srii7cr1"; + sha256 = "0qw4zyd86fjwsav744jvz1wpdbmy9nz645xqr9s1d1bs88v221v1"; + }; + + beamDeps = [ erlex ]; + }; + + earmark = buildMix rec { + name = "earmark"; + version = "1.4.34"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "012mwv4ixll3gmav9v0wzlin2948ghb2imnp20xi6nyqvbrhdcch"; }; beamDeps = [ earmark_parser ]; @@ -335,12 +348,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.9.2"; + version = "3.9.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; + sha256 = "0xgfz1pzylj22k0qa8zh4idvd4139b1lwnmq33na8fia2j69hpyy"; }; beamDeps = [ decimal jason telemetry ]; @@ -374,12 +387,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.9.1"; + version = "3.9.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "060iqmkqnsyy2kv05s218ady9lgnz7rvgknwz6xjks7jzyj71m2z"; + sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -398,6 +411,19 @@ let beamDeps = []; }; + erlex = buildMix rec { + name = "erlex"; + version = "0.2.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + }; + + beamDeps = []; + }; + eternal = buildMix rec { name = "eternal"; version = "1.2.2"; @@ -426,12 +452,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.3.3"; + version = "2.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "017iswr9m2kwri2m5j3r9m0b7hk4vqqddbqy09k5d4nfz6vg0i00"; + sha256 = "1fsngrldq2g3i2f7y5m4d85sd7hx4jiwnfcxhs14bnalfziadpc5"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -491,12 +517,12 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.12.3"; + version = "0.15.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; + sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq"; }; beamDeps = [ hackney jason ]; @@ -543,12 +569,12 @@ let finch = buildMix rec { name = "finch"; - version = "0.13.0"; + version = "0.14.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1k56zfbadpppn8flavb4aczq0npcqnlhg993l51c1k8dw76pv5a9"; + sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal"; }; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; @@ -593,17 +619,17 @@ let beamDeps = []; }; - gun = buildRebar3 rec { - name = "gun"; - version = "2.0.0-rc.2"; + gettext = buildMix rec { + name = "gettext"; + version = "0.20.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw"; }; - beamDeps = [ cowlib ]; + beamDeps = []; }; hackney = buildRebar3 rec { @@ -725,12 +751,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.2"; + version = "1.11.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1lj715gzl022yc47qsg9712x8nc9wi7x70msv8c3lpym92y3y54q"; + sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw"; }; beamDeps = []; @@ -749,6 +775,19 @@ let beamDeps = []; }; + mail = buildMix rec { + name = "mail"; + version = "0.2.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk"; + }; + + beamDeps = []; + }; + majic = buildMix rec { name = "majic"; version = "1.0.0"; @@ -907,12 +946,12 @@ let nimble_options = buildMix rec { name = "nimble_options"; - version = "0.4.0"; + version = "0.5.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd"; }; beamDeps = []; @@ -959,12 +998,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.10.0"; + version = "3.16.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + sha256 = "0a91jzgq6qp6ba5kxcz8fli2d1l49d8pz8dxikyfhwwbci5f42xv"; }; beamDeps = [ jason plug poison ]; @@ -1024,12 +1063,12 @@ let phoenix_live_dashboard = buildMix rec { name = "phoenix_live_dashboard"; - version = "0.6.5"; + version = "0.7.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0lmq1m7k465i9mzw35l7bx69n85mibwzd76976840r43sw6sakzg"; + sha256 = "1dq5vj1a6fzclr3fwj7y8rg2xq3yigvgqc3aaq664fvs7h3dypqf"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1037,15 +1076,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.17.12"; + version = "0.18.6"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1j4r1pjl60hphan7mf0fn60cnqkdc7hah9zmf4sz8vy1mbhdavdg"; + sha256 = "0wvbpi16bfn4hxyqs7907aln5di30v3hskzw2ggp1hy38kxnh9yf"; }; - beamDeps = [ jason phoenix phoenix_html telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1102,12 +1141,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.10.4"; + version = "1.14.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; + sha256 = "056wkb1b17mh5h9ncs2vbswvpjsm2iqc580nmyrvgznlqwr080mz"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1204,19 +1243,6 @@ let beamDeps = []; }; - quack = buildMix rec { - name = "quack"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp"; - }; - - beamDeps = [ poison tesla ]; - }; - ranch = buildRebar3 rec { name = "ranch"; version = "1.8.0"; @@ -1232,17 +1258,30 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.2"; + version = "2.5.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "070f4dgfp1vzvz0fxwavzv9bd7nl5fx3rmmkyr0zy7g9vv426x9c"; + sha256 = "1mwr6267lwl4p7f8jfk14s4cszxwra6zgf84hkcxz8fldzs86rkc"; }; beamDeps = []; }; + remote_ip = buildMix rec { + name = "remote_ip"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; + }; + + beamDeps = [ combine plug ]; + }; + sleeplocks = buildRebar3 rec { name = "sleeplocks"; version = "1.1.2"; @@ -1297,15 +1336,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.8.2"; + version = "1.9.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; + sha256 = "07ipsrp34s18c9zd5kglqsdc8z7gxa9aadsrklj0zf6azzrzzpvn"; }; - beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1360,6 +1399,45 @@ let beamDeps = [ telemetry ]; }; + telemetry_metrics_prometheus = buildMix rec { + name = "telemetry_metrics_prometheus"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09jdrv0ik5svi77djycva7a6a8sl05vp2nr7w17s8k94ndckcfyl"; + }; + + beamDeps = [ plug_cowboy telemetry_metrics_prometheus_core ]; + }; + + telemetry_metrics_prometheus_core = buildMix rec { + name = "telemetry_metrics_prometheus_core"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0sd0j7arhf22ickzdfmq656258dh14kzi61p0vgra007x1zhxl8d"; + }; + + beamDeps = [ telemetry telemetry_metrics ]; + }; + + telemetry_poller = buildRebar3 rec { + name = "telemetry_poller"; + version = "0.5.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc"; + }; + + beamDeps = [ telemetry ]; + }; + tesla = buildMix rec { name = "tesla"; version = "1.4.4"; @@ -1370,7 +1448,7 @@ let sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; }; - beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; + beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; }; timex = buildMix rec { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index e1ff2e14cf34..a1cd2719f848 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/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/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index b52b0fb0220e..5bfb2881c4cc 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -15,11 +15,11 @@ in optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" (stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.19.1"; + version = "7.19.5"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-icfyxuS6chh3ibXZ0V9YYB0oCDd9o5rmcDC5Rbr0tOQ="; + sha256 = "sha256-32syhzbFCWzwE2NftTY58aA+iD0kABraT4FA7mYU1II="; }; buildPhase = '' diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 37d6b7251a32..b4cd637d3d02 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.2"; + version = "2.6.4"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg="; + hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; + hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0="; }; - vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; + vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM="; 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/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 634a6aed1402..c20a0e325ec9 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/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/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/servers/caddy/xcaddy/inject_version_info.diff new file mode 100644 index 000000000000..4d87aa687878 --- /dev/null +++ b/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/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1bee79918927..2281031a6449 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/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/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index fbbda3837b97..d4669488901a 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml - ${if confFile != "" then "cat ${confFile} >> defaults.yaml" else ""} + ${lib.optionalString (confFile != "") "cat ${confFile} >> defaults.yaml"} mv defaults.yaml $out/conf; # Link to extra jars diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index bb9ae3ced4d7..514e9cbbe043 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-Kb4nkxuyZHJT5dqFSkqReFkN8q1uYm7wbhSIiLd8Hck="; + sha256 = "sha256-/+D/jATZhHSxLPB8RkPLUYAZ3O+/9l8XIhgokXz2SUQ="; }; - vendorSha256 = "sha256-nyMeKmGoypDrpZHYHGjhRnjgC3tbOX/dlj96pnXrdLE="; + vendorHash = "sha256-aWmwzIHScIMb3DPzr4eto2yETMgKd/hUy18X8KxQGos="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index a41581d934c6..a449b242daf6 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/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/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index 427233278707..ede9f78e8d59 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/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/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 079b87fe9a73..1b50e3cbe459 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -36,11 +36,8 @@ buildPythonPackage rec { pynacl redis typing-extensions - ] ++ lib.optional withLdap [ - python-ldap - ] ++ lib.optional withPostgres [ - psycopg2 - ]; + ] ++ lib.optional withLdap python-ldap + ++ lib.optional withPostgres psycopg2; installPhase = '' mkdir -p $out/bin $out/lib diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index fccc1ba0016b..f50e3b19583c 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -1,22 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "filtron"; version = "0.2.0"; - goPackagePath = "github.com/asciimoo/filtron"; - src = fetchFromGitHub { owner = "asciimoo"; repo = "filtron"; rev = "v${version}"; - sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26"; + hash = "sha256-RihxlJvbHq5PaJz89NHl/wyXrKjSiC4XYAs7LSKAo6E="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-1DRR16WiBGvhOpq12L5njJJRRCIA7ajs1Py9j/3cWPE="; - # The upstream test checks are obsolete/unmaintained. - doCheck = false; + patches = [ + # Update golang version in go.mod + (fetchpatch { + url = "https://github.com/asciimoo/filtron/commit/365a0131074b3b12aaa65194bfb542182a63413c.patch"; + hash = "sha256-QGR6YetEzA/b6tC4uD94LBkWv0+9PG7RD72Tpkn2gQU="; + }) + # Add missing go.sum file + (fetchpatch { + url = "https://github.com/asciimoo/filtron/commit/077769282b4e392e96a194c8ae71ff9f693560ea.patch"; + hash = "sha256-BhHbXDKiRjSzC6NKhKUiH6rjt/EgJcEprHMMJ1x/wiQ="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Reverse HTTP proxy to filter requests by different rules."; diff --git a/pkgs/servers/filtron/deps.nix b/pkgs/servers/filtron/deps.nix deleted file mode 100644 index 61320f868d05..000000000000 --- a/pkgs/servers/filtron/deps.nix +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - goPackagePath = "github.com/valyala/fasthttp"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasthttp"; - rev = "v1.41.0"; - sha256 = "sha256-lV9FP7GjnQk/kJACE9l5CZ/8kzORdNpYS5lPokEYrZM="; - }; - } - - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.15.12"; - sha256 = "sha256-D41sCSbaqX9tXIRcTU9TYyjPyZpuKLDeQMXETE2ulbM="; - }; - } - - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "v1.0.0"; - sha256 = "sha256-I9FPZ3kCNRB+o0dpMwBnwZ35Fj9+ThvITn8a3Jr8mAY="; - }; - } - - { - goPackagePath = "github.com/andybalholm/brotli"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/brotli"; - rev = "v1.0.4"; - sha256 = "sha256-gAnPRdGP4yna4hiRIEDyBtDOVJqd7RU27wlPu96Rdf8="; - }; - } -] diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 9d65198c8cef..436f0a7fc4d1 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -60,6 +60,11 @@ let (lib.optionalString (!useClang) "-DUSE_LD=GOLD") ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=missing-template-keyword" + ]; + inherit patches; # fix up the use of the very weird and custom 'fdb_install' command by just diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 354412a4b73f..351f54f21d49 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchgit, nixosTests }: +{ lib, buildGoModule, fetchgit, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "molly-brown"; - version = "unstable-2020-08-19"; - rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; - - goPackagePath = "tildegit.org/solderpunk/molly-brown"; + version = "unstable-2023-02-10"; src = fetchgit { - inherit rev; url = "https://tildegit.org/solderpunk/molly-brown.git"; - sha256 = "1w79a25mbgav95p78fkdm9j62chwwpkqv0m2wmh5my03yq398gya"; + rev = "56d8dde14abc90b784b7844602f12100af9756e0"; + hash = "sha256-kfopRyCrDaiVjKYseyWacIT9MJ8PzB8LAs6YMgYqCrs="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-czfHnXS9tf5vQQNXhWH7DStmhsorSc4Di/yZuv4LHRk="; + + ldflags = [ "-s" "-w" ]; passthru.tests.basic = nixosTests.molly-brown; diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/servers/gemini/molly-brown/deps.nix deleted file mode 100644 index 95427e8f7907..000000000000 --- a/pkgs/servers/gemini/molly-brown/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } -] diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix index 3eae9c2b33cb..781edfce98c8 100644 --- a/pkgs/servers/geospatial/mapcache/default.nix +++ b/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/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index a187259db69e..21247ce2affc 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90="; + hash = "sha256-UIAsij4fFxGAoKluQFAtrfgKIteM+LQtAKRDvRaNLSg="; }; - cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8="; + cargoHash = "sha256-NtPI8MZNUn+QYPuG9WNMVZJW6jmyi5gEfNw8MrkiwUQ="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; doCheck = false; diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/servers/gnss-share/default.nix new file mode 100644 index 000000000000..81efe84d1c4f --- /dev/null +++ b/pkgs/servers/gnss-share/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitLab, lib }: +buildGoModule rec { + pname = "gnss-share"; + version = "0.6"; + src = fetchFromGitLab { + owner = "postmarketOS"; + repo = "gnss-share"; + rev = version; + hash = "sha256-vVmQlhzRISMBcYZh/9GQmOGzDgTzu2jSyIiEWdXPqOQ="; + }; + vendorHash = "sha256-hS/xSxZSMHP+qlvpJYV6EvXtWx9ESamJ8lOf926CqOw="; + meta = with lib; { + description = "share GNSS data between multiple clients"; + longDescription = '' + gnss-share is an app that facilitates sharing GNSS location data with multiple + clients, while providing a way to perform device-specific setup beforehand. For + some devices, it can also manage loading and storing A-GPS data. + + This is meant to replace things like gpsd, and gps-share, and work together + with geoclue* or other clients that support fetching NMEA location data over + sockets. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ balsoft ]; + }; +} diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index c8a4b99d58e0..8ebcde82a446 100644 --- a/pkgs/servers/headscale/default.nix +++ b/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/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a2551e362a58..dafb5b4976d2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.2.1"; + version = "2023.2.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 62e8b042815a..4d6e0b6cca62 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -249,8 +249,7 @@ let ]; python = python3.override { - # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); + packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; componentPackages = import ./component-packages.nix; @@ -271,7 +270,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.1"; + hassVersion = "2023.2.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -289,7 +288,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-gWcq0E/k6c4YQJwLlU379kse2u4Yn6xvLZ5QnGXVTJA="; + hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 2474f5888a39..7c826efbf4cf 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.112.1"; + version = "0.112.5"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-Y/Py7WTv8tiPdbPswpVhqpBW5l2XJB7T3KDm+xWfl8s="; + hash = "sha256-UoBepu+9A4nuv9HdjYacMXzXqdS24KU4hYuRlEhsdKQ="; }; vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g="; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index aed6a36be1d7..4a219a9cfb05 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -149,6 +149,7 @@ buildBazelPackage rec { "--spawn_strategy=standalone" "--noexperimental_strict_action_env" "--cxxopt=-Wno-error" + "--linkopt=-Wl,-z,noexecstack" # Force use of system Java. "--extra_toolchains=@local_jdk//:all" diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 06fa12725674..f882b782bcc1 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -31,14 +31,12 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , passthru ? { tests = {}; } }: -with lib; - let moduleNames = map (mod: mod.name or (throw "The nginx module with source ${toString mod.src} does not have a `name` attribute. This prevents duplicate module detection and is no longer supported.")) modules; - mapModules = attrPath: flip concatMap modules + mapModules = attrPath: lib.flip lib.concatMap modules (mod: let supports = mod.supports or (_: true); in @@ -47,8 +45,8 @@ let in -assert assertMsg (unique moduleNames == moduleNames) - "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; +assert lib.assertMsg (lib.unique moduleNames == moduleNames) + "nginx: duplicate modules: ${lib.concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; stdenv.mkDerivation { inherit pname version nginxVersion; @@ -94,37 +92,37 @@ stdenv.mkDerivation { "--http-fastcgi-temp-path=/tmp/nginx_fastcgi" "--http-uwsgi-temp-path=/tmp/nginx_uwsgi" "--http-scgi-temp-path=/tmp/nginx_scgi" - ] ++ optionals withDebug [ + ] ++ lib.optionals withDebug [ "--with-debug" - ] ++ optionals withKTLS [ + ] ++ lib.optionals withKTLS [ "--with-openssl-opt=enable-ktls" - ] ++ optionals withStream [ + ] ++ lib.optionals withStream [ "--with-stream" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optionals withMail [ + ] ++ lib.optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optionals withPerl [ + ] ++ lib.optionals withPerl [ "--with-http_perl_module" "--with-perl=${perl}/bin/perl" "--with-perl_modules_path=lib/perl5" - ] ++ optional withSlice "--with-http_slice_module" - ++ optional (gd != null) "--with-http_image_filter_module" - ++ optional (geoip != null) "--with-http_geoip_module" - ++ optional (withStream && geoip != null) "--with-stream_geoip_module" - ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ] ++ lib.optional withSlice "--with-http_slice_module" + ++ lib.optional (gd != null) "--with-http_image_filter_module" + ++ lib.optional (geoip != null) "--with-http_geoip_module" + ++ lib.optional (withStream && geoip != null) "--with-stream_geoip_module" + ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; @@ -133,7 +131,7 @@ stdenv.mkDerivation { preConfigure = '' setOutputFlags= '' + preConfigure - + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; + + lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; patches = map fixPatch ([ (substituteAll { @@ -143,7 +141,7 @@ stdenv.mkDerivation { ''; }) ./nix-skip-check-logs-path.patch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch"; sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; @@ -161,7 +159,7 @@ stdenv.mkDerivation { inherit postPatch; - hardeningEnable = optional (!stdenv.isDarwin) "pie"; + hardeningEnable = lib.optional (!stdenv.isDarwin) "pie"; enableParallelBuilding = true; @@ -186,7 +184,7 @@ stdenv.mkDerivation { } // passthru.tests; }; - meta = if meta != null then meta else { + meta = if meta != null then meta else with lib; { description = "A reverse proxy and lightweight webserver"; homepage = "http://nginx.org"; license = licenses.bsd2; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 971e04dcd365..d09c98ef2a20 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -351,8 +351,8 @@ let self = { name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; - rev = "0.7.8"; - sha256 = "sha256-jsR8EOeW8tAo2utKznuUaCG4hK0oU0ZJSnnGmI5HUDk="; + rev = "0.7.10"; + sha256 = "sha256-/yKzY+BUFxLk8bWo+mqKfRVRsC2moe+WvhaRYIGdr6Y="; name = "nginx-njs"; }; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 875744898f62..83d482e251a1 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/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/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix index cfab6e2e9030..8ab50dc957a6 100644 --- a/pkgs/servers/imaginary/default.nix +++ b/pkgs/servers/imaginary/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, vips +}: buildGoModule rec { pname = "imaginary"; @@ -11,6 +17,16 @@ buildGoModule rec { hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA="; }; + patches = [ + # add -return-size flag recommend by Nextcloud + # https://github.com/h2non/imaginary/pull/382 + (fetchpatch { + name = "return-width-and-height-of-generated-images.patch"; + url = "https://github.com/h2non/imaginary/commit/cfbf8d724cd326e835dfcb01e7224397c46037d3.patch"; + hash = "sha256-TwZ5WU5g9LXrenpfY52jYsc6KsEt2fjDq7cPz6ILlhA="; + }) + ]; + vendorHash = "sha256-BluY6Fz4yAKJ/A9aFuPPsgQN9N/5yd8g8rDfIZeYz5U="; buildInputs = [ vips ]; @@ -23,11 +39,13 @@ buildGoModule rec { "-X main.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://fly.io/docs/app-guides/run-a-global-image-service"; changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}"; description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ dotlambda urandom ]; }; } diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index bb6063fdafb4..81f43b46aa0e 100644 --- a/pkgs/servers/invidious/versions.json +++ b/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": "7993784701686c057b85c57704537135e6326de9", + "sha256": "sha256-LKoUm38gUXucOdXmiJGaKt7ckeb7JBd5I/AxDRDnq30=", + "version": "unstable-2023-02-13" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ba6e1cdcc7a7..c7e82cd8c1f7 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2782"; + version = "0.20.3063"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-qBstaZfBts2EfYVt+iU9QqIEVRfPIqt122NAMlS42yoV7iLqeXfK989Wm6FoYtTvvgtNpVJ9rLPNMSSH3AX3TQ=="; + hash = "sha512-ROp2nKfXD9OWsgEUz7lhqVusIBBMHUhaPOp3g4F/25bAN0vl5E0Mm4m3V9ChvFV6otlxfZJEByBlsC+aALxbyg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index df3d7cf870e7..fa0296c55ebb 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-atJKpr4XLedG+A26ijlZKKFbskpLpJw9ThZvMuQYw+s="; + sha256 = "sha256-32xl/dVMuT9olC0fuN9dZFz1c6N9sLA5V9qaSjqkfo4="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 19a82bd8b939..31b4a457ec86 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "youtrack"; - version = "2021.4.35970"; + version = "2022.3.65371"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; - sha256 = "sha256-HB515TS0XXEAiT463nVHP/naeoF7nmeB+6EK0NJ+5c0="; + sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 7c9117f91c18..b1d38c4adc3d 100644 --- a/pkgs/servers/klipper/default.nix +++ b/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/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 01b19be5a650..f04a5e8f9836 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.28.1"; + version = "0.29.3"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gwI2ASJkHc2kOmC4D65Te7iz0Kozm8bpq2MUYZRBdtk="; + hash = "sha256-0QWODM1YT11x/h7vMkgAjPSGkHrOOHyaF6CCvip1hMQ="; }; - cargoSha256 = "sha256-9NkWYurq7S4ysnP7oLoggMNAIFay5qVWcuer4EOrQEA="; + cargoHash = "sha256-ri577SRLtx+5vazle8fqUL7Q75scAzvxUpAWl0Al6js="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index cd407ef37ec7..1a911668a540 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { ${lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} ${lib.optionalString enableAuthDovecot '' diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix index a5b6cf9228d5..844eb8dc3d88 100644 --- a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix +++ b/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/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix index f740a12e53f5..e9abdf0864f2 100644 --- a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix +++ b/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/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 93b85cee6bb9..63447dffb309 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk="; + hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM="; }; - cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc="; + cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index d0bb07c73880..d942bb0b2e5f 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-fuU92fydoazSXBHwA+DG//gRgWVYQ1M3m2oNS2iwv4I="; + sha256 = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; }; nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index c01eaaa5a555..5c1a1e3d985e 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r7ybdykxnn2544vcjmi51mxfpfqx3b4c7fjz15c57hamkhlalzf"; + sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "024a1c2ak1znkvys7pjkkan23wc0vhzyprl16gp9xcr4wy0l6dn4"; + sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "193gj013bx5axd4nwvlf6mq19rcvymkf72q9f7ml6v9yl6cc4qam"; + sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dygq5fxbrgynd2g7r51asyrap1d6cxravwh509kfmqpfbiq119s"; + sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13kr77v91wa7sfsq7h04g8zy1qxcbwhhf4k6zz8276b1d10szly5"; + sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m68my4dnj7q7986jwlb7gir0f7hahdsqbiaxfvgngwksa8fhrn1"; + sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f497khf51wrsah927pnmpl0yrcx82gajjk8brcrrbbbd9arlp5"; + sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183d7laxvwrw1d02qgm8rg9ljjihfiyh4vzi58xm42z3fr3bbhky"; + sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dsxi813wyhx2d0bbyc0nla4ck6nmmi3z3765gdqf6xl3dha5r2j"; + sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvmvfka2s7am8m3zdllblxiyyy4yr3ca6q6q5r23fd2qs7rmbz0"; + sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5pq2swzgddmwwr6x1phbspk1vw8cl88ci8jbi18mrirjjfippr"; + sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vqb2bfq5db7x66f4n4z30c953y5q8pwwl2067nxhz6j0c486pzm"; + sha256 = "1nz23laxgrxbv5svswi3bksmbhz86j691n4099qp4049i5a5cx91"; type = "gem"; }; - version = "1.587.0"; + version = "1.701.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +261,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; + sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; type = "gem"; }; - version = "3.130.2"; + version = "3.170.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; + sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; type = "gem"; }; - version = "1.56.0"; + version = "1.62.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; + sha256 = "1sg212jsj6ydyrr6r284mgqcl83kln2hfd9nlyisf3pj5lbdjd1c"; type = "gem"; }; - version = "1.114.0"; + version = "1.119.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,10 +294,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.2"; }; bcrypt = { groups = ["default" "pam_authentication"]; @@ -336,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "0mz9hz5clknznw8i5f3l2zb9103mlgh96djdhlvlfpf2chkr0s1z"; type = "gem"; }; - version = "2.4.10"; + version = "2.4.14"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -369,20 +369,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; brakeman = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306"; + sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; browser = { groups = ["default"]; @@ -400,10 +400,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjm184dhlw35ymi8ifpl5155vwl6wfzdc5qjvzv634gc365yz9j"; + sha256 = "1nd5zj5yqmhv9lrsqz8s2dqq28v4ywy95qrw7nzhhf89dl4dq49l"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; builder = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -421,10 +421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06rmq3s8q6xndxxl7qid9nf3hiaahs71jyiyyk3bx31hns1vkcci"; + sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.7"; }; bundler-audit = { dependencies = ["thor"]; @@ -508,10 +508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05df76mfhfab6d7ir0qy5xf1ad6kqdh2p6vfqv7nhlx45k1y4ysg"; + sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; type = "gem"; }; - version = "3.37.1"; + version = "3.38.0"; }; case_transform = { dependencies = ["activesupport"]; @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; connection_pool = { groups = ["default" "test"]; @@ -663,10 +663,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; type = "gem"; }; - version = "1.7.1"; + version = "1.12.0"; + }; + date = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; }; debug_inspector = { groups = ["default" "development"]; @@ -737,10 +747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi81lynfdvbwhrc4ws746g3j8761vian4m9gxamdj9rjwj9jhls"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.4"; + version = "1.4.0"; }; domain_name = { dependencies = ["unf"]; @@ -759,10 +769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1znfhqxvfdvxh0z8qnh1n7iahk9hs8d243j5dvig2v933j4z3ykw"; + sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; type = "gem"; }; - version = "5.6.0"; + version = "5.6.4"; }; dotenv = { groups = ["default"]; @@ -853,10 +863,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -874,10 +884,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05is0kb650j8wrdi4rgkdls662chnhdg2p64pgq3zkd3d7l2a9zw"; + sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby"; type = "gem"; }; - version = "0.76.0"; + version = "0.95.0"; }; fabrication = { groups = ["development" "test"]; @@ -895,10 +905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; + sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; type = "gem"; }; - version = "2.23.0"; + version = "3.1.1"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -1091,10 +1101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5"; type = "gem"; }; - version = "0.2.5"; + version = "0.3.0"; }; fugit = { dependencies = ["et-orbi" "raabro"]; @@ -1124,10 +1134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lqizfap12ica5c6q74ldarzmbpmhgl156bap9xhamrlm4za4i7a"; + sha256 = "1pp9cf6b68pky9bndmals070kibab525wjn9igx9pc5h8z1jv5bd"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1135,10 +1145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -1228,10 +1238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1280,10 +1290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mi38zgpwvasjq0cqz674crwal5rsaw8f89bww9zsw2vk77bhaq9"; + sha256 = "0zjsgrlvwpqsnrza4ijlxjld4550c661sgbqp2j2wp638nlnls1a"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -1312,10 +1322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm"; + sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; ipaddress = { groups = ["default"]; @@ -1332,20 +1342,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; json = { - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json-canonicalization = { groups = ["default"]; @@ -1358,15 +1368,15 @@ version = "0.3.0"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; + sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.3"; }; json-ld = { dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"]; @@ -1385,10 +1395,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h0pfxyrsbifzhwfxj1ppaxbk7v2z8mw53a0mi49i986wyspxlgv"; + sha256 = "004s52m37b2kbw8dv4rdfm2d90h1023z1mw9zfcs0x87v8aq7zyn"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.2"; + }; + json-schema = { + dependencies = ["addressable"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; + type = "gem"; + }; + version = "3.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1405,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1535,21 +1556,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "0n0pijrc465zzrv5flxc41375zwaz9yfc2n0r80zjwarc1ixkdx1"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0.1"; }; makara = { dependencies = ["activerecord"]; @@ -1598,10 +1619,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; method_source = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1613,17 +1634,6 @@ }; version = "1.0.0"; }; - microformats = { - dependencies = ["json" "nokogiri"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "094m75yw2cvadpvj4rawy6s4ykx9nvv8dhikxrp8zng2ywlaqmic"; - type = "gem"; - }; - version = "4.4.1"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -1660,30 +1670,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; type = "gem"; }; - version = "1.5.4"; + version = "1.6.0"; }; multi_json = { groups = ["default"]; @@ -1705,6 +1715,17 @@ }; version = "2.1.1"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1715,6 +1736,28 @@ }; version = "0.17.1"; }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default" "development"]; @@ -1726,6 +1769,17 @@ }; version = "4.0.0.rc1"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default" "development"]; platforms = []; @@ -1752,10 +1806,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.1"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1773,10 +1827,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.21"; + version = "3.13.23"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1823,15 +1877,15 @@ version = "1.10.3"; }; openid_connect = { - dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + dependencies = ["activemodel" "attr_required" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7"; + sha256 = "1k9kdivp45v6vhzdrnl5fzhd378gjj2hl4w9bazbqnfm15rsnzc8"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; openssl = { groups = ["default"]; @@ -1869,13 +1923,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "054xq22rwj26jag43s5fb4vb4x2252dz6rvgjn42id8ycs51my2w"; + sha256 = "1g9ivy30jx7hjl8l3il47dmc9xgla8dj762v5cw0mgzpd9rq6vr4"; type = "gem"; }; - version = "2.14.11"; + version = "2.14.14"; }; parallel = { - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1890,10 +1944,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.0.0"; }; parslet = { groups = ["default"]; @@ -1921,10 +1975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; pghero = { dependencies = ["activerecord"]; @@ -1932,20 +1986,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a"; + sha256 = "0wi1mls8r6r43dy5m6dsdqk28q564164h97pp7a111pgkbdmxf83"; type = "gem"; }; - version = "2.8.3"; + version = "3.1.0"; }; pkg-config = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl"; + sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; type = "gem"; }; - version = "1.4.9"; + version = "1.5.1"; }; posix-spawn = { groups = ["default"]; @@ -1963,21 +2017,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0zz3vwv1kyr43chvrpvhb8wm9qgcaz8ckc1lj2jxfp6xsss971"; + sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r"; type = "gem"; }; - version = "1.14.2"; + version = "1.18.0"; }; premailer-rails = { - dependencies = ["actionmailer" "premailer"]; + dependencies = ["actionmailer" "net-smtp" "premailer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q23clzqgzxcg1jld7hn5jy2yqxvana3iw66vmjgzz7y4ylf97b6"; + sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.0"; }; private_address_check = { groups = ["production" "test"]; @@ -2027,10 +2081,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -2049,10 +2103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17z2f7w3syh3c04c8m1v9pvb9pfpymk8b5plszr5l24hx374xvsd"; + sha256 = "1wb03yzy1j41822rbfh9nn77im3zh1f5v8di05cd8rsrdpws542b"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; raabro = { groups = ["default"]; @@ -2069,20 +2123,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-attack = { dependencies = ["rack"]; @@ -2112,10 +2166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; + sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2123,10 +2177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdr2r5phr3q7d6k9cnxjwlkaps0my0n43wq9mzw3xdqhg9wa3d6"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -2145,10 +2199,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01l06196jkidj07g8jdc43nr060r46hsjz8bk4bdk0lzzck94fvf"; + sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2178,10 +2232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -2211,10 +2265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iwziqrzk7f7r3w5pkfnbh1mqsfsywy7lvz2blqds3nval79dw2x"; + sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2253,20 +2307,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysa8v2xw0ln4kdwhkg6mh71v5wbancsz5cf945kbk47m1ybn271"; + sha256 = "1dngmsk9wg1vws56pl87dys0ns4bcn9arf8ip6zxa0gypr3ifq3m"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; redis = { groups = ["default" "test"]; @@ -2284,20 +2338,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; + sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; + }; + redlock = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c"; + type = "gem"; + }; + version = "1.3.2"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.2"; }; request_store = { dependencies = ["rack"]; @@ -2449,37 +2514,70 @@ version = "0.6.0"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["development"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "088xzzq6vjsgi2cj9rnz2jlj5mghmgq1j250pn5zy8yqd39vxz71"; + sha256 = "0f4n844yr2jrbddf79cam8qg41k2gkpyjjgd4zgbd8df1ijbld6p"; type = "gem"; }; - version = "1.30.1"; + version = "1.44.1"; }; rubocop-ast = { dependencies = ["parser"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; + sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; type = "gem"; }; - version = "1.18.0"; + version = "1.24.1"; + }; + rubocop-capybara = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + type = "gem"; + }; + version = "2.17.0"; + }; + rubocop-performance = { + dependencies = ["rubocop" "rubocop-ast"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + type = "gem"; + }; + version = "1.16.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19x0d6jmryky5sx50qgsan1g0gxb7lcgrmfrwjsa5w6shcyvbp8c"; + sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; type = "gem"; }; - version = "2.15.0"; + version = "2.17.4"; + }; + rubocop-rspec = { + dependencies = ["rubocop" "rubocop-capybara"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + type = "gem"; + }; + version = "2.18.1"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2540,10 +2638,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; scenic = { dependencies = ["activerecord" "railties"]; @@ -2551,10 +2649,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl14f5lfidbvcx52q49xnxc4dccyrzyv38qjkda8dh07zsksw85"; + sha256 = "04sd4jmgnwpilr3k061x87yyryya2mj15a8602fip49lfxza5548"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; semantic_range = { groups = ["default"]; @@ -2572,10 +2670,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; + sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; type = "gem"; }; - version = "6.5.7"; + version = "6.5.8"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2600,15 +2698,15 @@ version = "4.0.3"; }; sidekiq-unique-jobs = { - dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"]; + dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "redis" "sidekiq" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13s723wy8sh8x7ff1b1r0vxk6y6ygcjvpirjp0inl5824ds15s12"; + sha256 = "02f91b24hrrn688wqvxb13lwvcgqb7g9k3sxylnydd6v89wr8mcg"; type = "gem"; }; - version = "7.1.27"; + version = "7.1.29"; }; simple-navigation = { dependencies = ["activesupport"]; @@ -2627,10 +2725,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09raw1gw0db9hfddgvzjwpk4hj1ng4dfq3igak80jkvhg4jdg7jp"; + sha256 = "0z4df65w9qpri315lpvzazdxa9xb7yj0j3d77q06wf0jnpvw4mzs"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2638,10 +2736,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -2658,10 +2756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl3j7p3b5q7sxsx1va63c8imc5x6g99xablz08qrmqhpi0d6g6j"; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; smart_properties = { groups = ["default" "development" "test"]; @@ -2711,10 +2809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc"; + sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; type = "gem"; }; - version = "0.2.22"; + version = "0.2.23"; }; statsd-ruby = { groups = ["default"]; @@ -2727,14 +2825,15 @@ version = "1.5.0"; }; stoplight = { + dependencies = ["redlock"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1628qf2ynldqz20h5lkaivk166qknk15gxg130n9pvz568k1sdp8"; + sha256 = "0rmhhqvvrn7874r9cjf4wpv36vnxvxsrgb1kfgdk3dalg4rig7q6"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; strong_migrations = { dependencies = ["activerecord"]; @@ -2810,6 +2909,16 @@ }; version = "2.0.11"; }; + timeout = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + type = "gem"; + }; + version = "0.3.1"; + }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; groups = ["default"]; @@ -2890,10 +2999,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; tzinfo-data = { dependencies = ["tzinfo"]; @@ -2901,10 +3010,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lslg5vvhx6w0mkbf6gpqvr9h8pj84wc639vk7ix7bqk61wgfch9"; + sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; type = "gem"; }; - version = "1.2022.4"; + version = "1.2022.7"; }; unf = { dependencies = ["unf_ext"]; @@ -2932,10 +3041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.2"; }; uniform_notifier = { groups = ["default" "development"]; @@ -3019,10 +3128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cq6m5qwm3bmi7hkjfmbg2cs4qjq4wswlrwcfk8l1svfqbi135v3"; + sha256 = "0fh4vijqiq1h7w28llk67y9csc0m4wkdivrsl4fsxg279v6j5z3i"; type = "gem"; }; - version = "5.4.3"; + version = "5.4.4"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -3094,10 +3203,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 8ab2543e4760..891e96d68481 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v4.0.2"; - sha256 = "1szb11bss66yvh8750pzib3r0w1fm9h84sf5daqsnbm871hgzlw0"; + rev = "v4.1.0"; + sha256 = "00nc80s1hz4sdpq81hsv2r9da3bjn4lgwpk7w24zy2016iwjjwbb"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index b79176c23c34..c283b30007c5 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.0.2" +"4.1.0" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0c42373dd288..9253b93945b1 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.76.0"; + version = "1.77.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-kPc6T8yLe1TDxPKLnK/TcU+RUxAVIq8qsr5JQXCXyjM="; + hash = "sha256-//1BTiNH3n2eNjwOADb1OB7xp5QsH6arV5Pg3B7y3r0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tXtnVYH9uWu0nHHx53PgML92NWl3qcAcnFKhiijvQBc="; + hash = "sha256-B9Z+7VtbbX/S01aaMFHgXH60sg8Lmwku2XPRnpMpwjo="; }; postPatch = '' @@ -67,7 +67,6 @@ buildPythonApplication rec { pyasn1 pydantic pyicu - pyjwt pymacaroons pynacl pyopenssl diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 8716de1f1d77..d96e60ba780f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "matrix-appservice-irc"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = "refs/tags/${version}"; - hash = "sha256-8/jLONqf+0JRAK/SLj3qlG6Dm0VRl4h6YWeZnz4pVXc="; + hash = "sha256-krF/eUyGHB4M3sQVaBh7+OaHnM/g9XVaBa8gizPkLKE="; }; - npmDepsHash = "sha256-fGft7au5js9DRoXYccBPdJyaZ3zfsuCwUwWPOxwAodo="; + npmDepsHash = "sha256-VkVpFt3cwnBkN0AGDaE5Bd6xINGL6XugZ4TBsDONWCg="; nativeBuildInputs = [ python3 diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 01819e8e99f2..e6eab7da86af 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/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/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 385fd1a78484..9b5f2c813164 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-fLYc0Z9lgNYjv4D+TpKP1+sBuILV1lf1IEDRYc8fUY4="; + hash = "sha256-0hnBqYwFVVlqv+8Cx2qvytDU6I+MPWQIpG4nYd7mPLM="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-RUTImaiiCsNHZHGTAXPXySP3tlEUJr6DLhmNA3ubgFs="; + vendorSha256 = "sha256-n3DBPI1gjbmP9m+xkGVoTSBcA0ELSokNZb9i3cYmAqc="; doCheck = false; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 7d629ddb68e1..9958201c071a 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -179,8 +179,6 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_DIR=/tmp ''; - checkTarget = "ptest"; - outputs = [ "out" "dev" "doc" ]; passthru = { diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 8c63b0fb940d..770ca8c76e86 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -14,13 +14,13 @@ let - version = "0.48.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-FO2Vl3LeajvZ8CLtnsOSLXr//gaOWPbMthj70RHxp+Q="; + hash = "sha256-YaBtzMW2zUHRYJDDF+mMll2rMBAg5os2HSP0uEujoWI="; }; ui = callPackage ./ui { @@ -35,7 +35,7 @@ buildGoModule { inherit src version; - vendorSha256 = "sha256-LPoM5RFHfTTWZtlxc59hly12zzrY8wjXGZ6xW2teOFM="; + vendorSha256 = "sha256-9JDP58UxlSadMXD7gUl2oN+uiYN9RlGO4HMuZJhO9mw="; nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -70,5 +70,7 @@ buildGoModule { sourceProvenance = with lib.sourceTypes; [ fromSource ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aciceri squalus ]; + # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/misc/navidrome/ui/node-packages.nix b/pkgs/servers/misc/navidrome/ui/node-packages.nix index e3d35ef90954..7392bf815b45 100644 --- a/pkgs/servers/misc/navidrome/ui/node-packages.nix +++ b/pkgs/servers/misc/navidrome/ui/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@adobe/css-tools-4.0.1" = { + name = "_at_adobe_slash_css-tools"; + packageName = "@adobe/css-tools"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz"; + sha512 = "+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g=="; + }; + }; "@ampproject/remapping-2.2.0" = { name = "_at_ampproject_slash_remapping"; packageName = "@ampproject/remapping"; @@ -1444,6 +1453,24 @@ let sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; }; }; + "@jest/types-26.6.2" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"; + sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; + }; + }; + "@jest/types-27.0.6" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "27.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz"; + sha512 = "aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g=="; + }; + }; "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -1561,13 +1588,13 @@ let sha512 = "GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw=="; }; }; - "@material-ui/styles-4.11.4" = { + "@material-ui/styles-4.11.5" = { name = "_at_material-ui_slash_styles"; packageName = "@material-ui/styles"; - version = "4.11.4"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.4.tgz"; - sha512 = "KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew=="; + url = "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz"; + sha512 = "o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA=="; }; }; "@material-ui/system-4.11.3" = { @@ -1588,13 +1615,13 @@ let sha512 = "7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A=="; }; }; - "@material-ui/utils-4.11.2" = { + "@material-ui/utils-4.11.3" = { name = "_at_material-ui_slash_utils"; packageName = "@material-ui/utils"; - version = "4.11.2"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz"; - sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; + url = "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz"; + sha512 = "ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1786,6 +1813,15 @@ let sha512 = "ka0W0KN5i6LfrSocduwliMMpqVgohtPFidKdMEOUjoOFCHcOOYkKsPRxfs5f15oPNHTm6ERAm0GV/+/LTKeiWg=="; }; }; + "@sindresorhus/is-0.14.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; "@sinonjs/commons-1.8.3" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; @@ -1939,6 +1975,78 @@ let sha512 = "DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g=="; }; }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + }; + "@testing-library/dom-7.31.2" = { + name = "_at_testing-library_slash_dom"; + packageName = "@testing-library/dom"; + version = "7.31.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz"; + sha512 = "3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ=="; + }; + }; + "@testing-library/dom-8.1.0" = { + name = "_at_testing-library_slash_dom"; + packageName = "@testing-library/dom"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/dom/-/dom-8.1.0.tgz"; + sha512 = "kmW9alndr19qd6DABzQ978zKQ+J65gU2Rzkl8hriIetPnwpesRaK4//jEQyYh8fEALmGhomD/LBQqt+o+DL95Q=="; + }; + }; + "@testing-library/jest-dom-5.16.5" = { + name = "_at_testing-library_slash_jest-dom"; + packageName = "@testing-library/jest-dom"; + version = "5.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz"; + sha512 = "N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA=="; + }; + }; + "@testing-library/react-11.2.7" = { + name = "_at_testing-library_slash_react"; + packageName = "@testing-library/react"; + version = "11.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz"; + sha512 = "tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA=="; + }; + }; + "@testing-library/react-12.1.5" = { + name = "_at_testing-library_slash_react"; + packageName = "@testing-library/react"; + version = "12.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz"; + sha512 = "OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg=="; + }; + }; + "@testing-library/react-hooks-7.0.2" = { + name = "_at_testing-library_slash_react-hooks"; + packageName = "@testing-library/react-hooks"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-7.0.2.tgz"; + sha512 = "dYxpz8u9m4q1TuzfcUApqi8iFfR6R0FaMbr2hjZJy1uC8z+bO/K4v8Gs9eogGKYQop7QsrBTFkv/BCF7MzD2Cg=="; + }; + }; + "@testing-library/user-event-13.5.0" = { + name = "_at_testing-library_slash_user-event"; + packageName = "@testing-library/user-event"; + version = "13.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz"; + sha512 = "5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg=="; + }; + }; "@tootallnate/once-1.1.2" = { name = "_at_tootallnate_slash_once"; packageName = "@tootallnate/once"; @@ -1957,6 +2065,15 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; + "@types/aria-query-4.2.2" = { + name = "_at_types_slash_aria-query"; + packageName = "@types/aria-query"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz"; + sha512 = "HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="; + }; + }; "@types/babel__core-7.1.14" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; @@ -2155,6 +2272,15 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; + "@types/jest-26.0.23" = { + name = "_at_types_slash_jest"; + packageName = "@types/jest"; + version = "26.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz"; + sha512 = "ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA=="; + }; + }; "@types/json-schema-7.0.11" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -2182,6 +2308,15 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; + "@types/minimist-1.2.2" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; + }; + }; "@types/node-14.0.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -2191,6 +2326,15 @@ let sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; }; }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; "@types/parse-json-4.0.0" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; @@ -2254,6 +2398,15 @@ let sha512 = "aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw=="; }; }; + "@types/react-dom-17.0.5" = { + name = "_at_types_slash_react-dom"; + packageName = "@types/react-dom"; + version = "17.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.5.tgz"; + sha512 = "ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ=="; + }; + }; "@types/react-redux-7.1.24" = { name = "_at_types_slash_react-redux"; packageName = "@types/react-redux"; @@ -2263,6 +2416,15 @@ let sha512 = "7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ=="; }; }; + "@types/react-test-renderer-17.0.1" = { + name = "_at_types_slash_react-test-renderer"; + packageName = "@types/react-test-renderer"; + version = "17.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz"; + sha512 = "3Fi2O6Zzq/f3QR9dRnlnHso9bMl7weKCviFmfF6B4LS1Uat6Hkm15k0ZAQuDz+UBq6B3+g+NM6IT2nr5QgPzCw=="; + }; + }; "@types/react-transition-group-4.4.1" = { name = "_at_types_slash_react-transition-group"; packageName = "@types/react-transition-group"; @@ -2326,6 +2488,15 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; + "@types/testing-library__jest-dom-5.9.5" = { + name = "_at_types_slash_testing-library__jest-dom"; + packageName = "@types/testing-library__jest-dom"; + version = "5.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz"; + sha512 = "ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ=="; + }; + }; "@types/trusted-types-2.0.2" = { name = "_at_types_slash_trusted-types"; packageName = "@types/trusted-types"; @@ -2344,6 +2515,15 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; + "@types/yargs-15.0.13" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; + sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; + }; + }; "@types/yargs-16.0.4" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -2758,6 +2938,15 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; + "ansi-align-3.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"; + sha512 = "ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="; + }; + }; "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -2776,6 +2965,15 @@ let sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; }; }; + "ansi-regex-4.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; + }; + }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -2866,6 +3064,15 @@ let sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA=="; }; }; + "aria-query-5.0.2" = { + name = "aria-query"; + packageName = "aria-query"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/aria-query/-/aria-query-5.0.2.tgz"; + sha512 = "eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -2929,6 +3136,15 @@ let sha512 = "5/+XXc6Sq/X0nKTqrnYfckvE4tIAMEJDSkGsdBl0OC6/Kvr38PHgT6amItyCKP2Fng1Ifi3mI+1r01f0opJQdQ=="; }; }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -3163,6 +3379,15 @@ let sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -3199,6 +3424,15 @@ let sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -3244,6 +3478,15 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; + "boxen-4.2.0" = { + name = "boxen"; + packageName = "boxen"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; + sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -3298,6 +3541,15 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; @@ -3334,6 +3586,15 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; + "cacheable-request-6.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -3388,6 +3649,15 @@ let sha512 = "QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="; }; }; + "camelcase-keys-6.2.2" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -3424,6 +3694,33 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -3451,6 +3748,15 @@ let sha512 = "oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="; }; }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; "check-types-11.1.2" = { name = "check-types"; packageName = "check-types"; @@ -3478,6 +3784,15 @@ let sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; }; }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; "ci-info-3.4.0" = { name = "ci-info"; packageName = "ci-info"; @@ -3505,13 +3820,13 @@ let sha512 = "JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="; }; }; - "classnames-2.3.1" = { + "classnames-2.3.2" = { name = "classnames"; packageName = "classnames"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz"; - sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; + url = "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"; + sha512 = "CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="; }; }; "clean-css-5.3.1" = { @@ -3523,6 +3838,42 @@ let sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; }; }; + "cli-boxes-2.2.1" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-spinners-2.6.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; + }; + }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -3532,6 +3883,24 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; "clsx-1.1.1" = { name = "clsx"; packageName = "clsx"; @@ -3721,6 +4090,15 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; + "configstore-5.0.1" = { + name = "configstore"; + packageName = "configstore"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + }; "confusing-browser-globals-1.0.11" = { name = "confusing-browser-globals"; packageName = "confusing-browser-globals"; @@ -4009,6 +4387,15 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; + "css.escape-1.5.1" = { + name = "css.escape"; + packageName = "css.escape"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz"; + sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; + }; + }; "cssdb-7.0.1" = { name = "cssdb"; packageName = "cssdb"; @@ -4171,6 +4558,24 @@ let sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; "decimal.js-10.4.1" = { name = "decimal.js"; packageName = "decimal.js"; @@ -4180,13 +4585,22 @@ let sha512 = "F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw=="; }; }; - "decode-uri-component-0.2.0" = { + "decode-uri-component-0.2.2" = { name = "decode-uri-component"; packageName = "decode-uri-component"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; "dedent-0.7.0" = { @@ -4198,6 +4612,15 @@ let sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -4225,6 +4648,24 @@ let sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; }; }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "defer-to-connect-1.1.3" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + }; + }; "define-lazy-prop-2.0.0" = { name = "define-lazy-prop"; packageName = "define-lazy-prop"; @@ -4342,6 +4783,15 @@ let sha512 = "gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="; }; }; + "diff-sequences-26.6.2" = { + name = "diff-sequences"; + packageName = "diff-sequences"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha512 = "Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="; + }; + }; "diff-sequences-27.5.1" = { name = "diff-sequences"; packageName = "diff-sequences"; @@ -4414,6 +4864,15 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; + "dom-accessibility-api-0.5.6" = { + name = "dom-accessibility-api"; + packageName = "dom-accessibility-api"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz"; + sha512 = "DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw=="; + }; + }; "dom-align-1.12.2" = { name = "dom-align"; packageName = "dom-align"; @@ -4531,6 +4990,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dot-prop-5.3.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + }; + }; "dotenv-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -4576,6 +5044,15 @@ let sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -4621,6 +5098,15 @@ let sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; }; }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -4657,6 +5143,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; "enhanced-resolve-5.10.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -4747,6 +5242,15 @@ let sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; + "escape-goat-2.1.1" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -5098,6 +5602,15 @@ let sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -5161,6 +5674,15 @@ let sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; }; }; + "figures-3.2.0" = { + name = "figures"; + packageName = "figures"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; + }; + }; "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -5476,6 +5998,24 @@ let sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.2.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + }; "get-stream-6.0.1" = { name = "get-stream"; packageName = "get-stream"; @@ -5530,6 +6070,15 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; + "global-dirs-2.1.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; + sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; + }; + }; "global-modules-2.0.0" = { name = "global-modules"; packageName = "global-modules"; @@ -5575,6 +6124,15 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; + "got-9.6.0" = { + name = "got"; + packageName = "got"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -5611,6 +6169,15 @@ let sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; + "hard-rejection-2.1.0" = { + name = "hard-rejection"; + packageName = "hard-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + }; "harmony-reflect-1.6.2" = { name = "harmony-reflect"; packageName = "harmony-reflect"; @@ -5683,6 +6250,15 @@ let sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; }; + "has-yarn-2.1.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -5719,6 +6295,15 @@ let sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; }; }; + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; "hpack.js-2.1.6" = { name = "hpack.js"; packageName = "hpack.js"; @@ -5782,6 +6367,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "http-cache-semantics-4.1.1" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; + }; + }; "http-deceiver-1.2.7" = { name = "http-deceiver"; packageName = "http-deceiver"; @@ -5917,6 +6511,15 @@ let sha1 = "94d2bda96084453ef36fbc5aaec37e0f79f1fc14"; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; @@ -5953,6 +6556,15 @@ let sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; "import-local-3.1.0" = { name = "import-local"; packageName = "import-local"; @@ -5980,6 +6592,15 @@ let sha512 = "G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ=="; }; }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; "inflection-1.12.0" = { name = "inflection"; packageName = "inflection"; @@ -6025,6 +6646,15 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; + "ini-1.3.7" = { + name = "ini"; + packageName = "ini"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; + sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; + }; + }; "ini-1.3.8" = { name = "ini"; packageName = "ini"; @@ -6034,6 +6664,15 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; + "inquirer-7.3.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; + }; + }; "internal-slot-1.0.3" = { name = "internal-slot"; packageName = "internal-slot"; @@ -6106,6 +6745,15 @@ let sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; "is-core-module-2.10.0" = { name = "is-core-module"; packageName = "is-core-module"; @@ -6142,6 +6790,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -6178,6 +6835,24 @@ let sha1 = "56ff4db683a078c6082eb95dad7dc62e1d04f835"; }; }; + "is-installed-globally-0.3.2" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; + sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; + }; + }; + "is-interactive-1.0.0" = { + name = "is-interactive"; + packageName = "is-interactive"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; + }; + }; "is-mobile-2.2.2" = { name = "is-mobile"; packageName = "is-mobile"; @@ -6205,6 +6880,15 @@ let sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; + "is-npm-4.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; + sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; + }; + }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -6232,6 +6916,33 @@ let sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; + "is-path-inside-3.0.3" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; "is-plain-obj-3.0.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -6322,6 +7033,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -6340,6 +7060,15 @@ let sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; + "is-yarn-global-0.3.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -6466,6 +7195,15 @@ let sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; }; }; + "jest-diff-26.6.2" = { + name = "jest-diff"; + packageName = "jest-diff"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz"; + sha512 = "6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA=="; + }; + }; "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; @@ -6511,6 +7249,15 @@ let sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; }; }; + "jest-get-type-26.3.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; + }; + }; "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; @@ -6808,6 +7555,15 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + }; "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; @@ -6853,22 +7609,22 @@ let sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; - "json5-1.0.1" = { + "json5-1.0.2" = { name = "json5"; packageName = "json5"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + url = "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "jsonexport-2.5.2" = { @@ -6988,6 +7744,15 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; + "keyv-3.1.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + }; "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; @@ -7033,6 +7798,15 @@ let sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; }; }; + "latest-version-5.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + }; + }; "leven-3.1.0" = { name = "leven"; packageName = "leven"; @@ -7087,22 +7861,22 @@ let sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; }; }; - "loader-utils-2.0.0" = { + "loader-utils-2.0.4" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.0"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; - sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; + sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; - "loader-utils-3.2.0" = { + "loader-utils-3.2.1" = { name = "loader-utils"; packageName = "loader-utils"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz"; - sha512 = "HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"; + sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; }; }; "locate-path-3.0.0" = { @@ -7213,6 +7987,15 @@ let sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -7231,6 +8014,24 @@ let sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -7240,6 +8041,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lz-string-1.4.4" = { + name = "lz-string"; + packageName = "lz-string"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"; + sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + }; + }; "magic-string-0.25.7" = { name = "magic-string"; packageName = "magic-string"; @@ -7267,6 +8077,24 @@ let sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "map-obj-4.3.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; + }; + }; "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; @@ -7303,6 +8131,15 @@ let sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; }; }; + "meow-7.1.1" = { + name = "meow"; + packageName = "meow"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; + sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -7384,6 +8221,24 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "min-indent-1.0.1" = { + name = "min-indent"; + packageName = "min-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; + }; + }; "mini-create-react-context-0.4.1" = { name = "mini-create-react-context"; packageName = "mini-create-react-context"; @@ -7411,15 +8266,6 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; @@ -7447,6 +8293,15 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; + "minimist-options-4.1.0" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -7492,6 +8347,15 @@ let sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; }; }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; @@ -7510,6 +8374,15 @@ let sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; + "navidrome-music-player-4.25.1" = { + name = "navidrome-music-player"; + packageName = "navidrome-music-player"; + version = "4.25.1"; + src = fetchurl { + url = "https://registry.npmjs.org/navidrome-music-player/-/navidrome-music-player-4.25.1.tgz"; + sha512 = "bHYr84ATUf/4+/PUoTpUSmpF4/igBx2UPhgnPqvda4FND+GJZtb1ikbMs1U+mhkNEUebe+2I29ob1zY7YZdtjg=="; + }; + }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -7573,6 +8446,15 @@ let sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; "normalize-path-3.0.0" = { name = "normalize-path"; packageName = "normalize-path"; @@ -7591,6 +8473,15 @@ let sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; }; }; + "normalize-url-4.5.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + }; "normalize-url-6.1.0" = { name = "normalize-url"; packageName = "normalize-url"; @@ -7798,6 +8689,33 @@ let sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; }; + "ora-5.4.1" = { + name = "ora"; + packageName = "ora"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "p-cancelable-1.1.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -7861,6 +8779,15 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; + "package-json-6.5.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + }; "param-case-3.0.4" = { name = "param-case"; packageName = "param-case"; @@ -8734,6 +9661,24 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "prettier-2.8.2" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz"; + sha512 = "BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw=="; + }; + }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8752,6 +9697,24 @@ let sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; }; }; + "pretty-format-26.6.2" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"; + sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; + }; + }; + "pretty-format-27.0.6" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "27.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz"; + sha512 = "8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ=="; + }; + }; "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; @@ -8824,6 +9787,15 @@ let sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -8833,6 +9805,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "pupa-2.1.1" = { + name = "pupa"; + packageName = "pupa"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + }; + }; "q-1.5.1" = { name = "q"; packageName = "q"; @@ -8878,6 +9859,15 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; "quick-lru-5.1.1" = { name = "quick-lru"; packageName = "quick-lru"; @@ -8923,6 +9913,15 @@ let sha512 = "w3020CLLmiammZOSKI4CsIWyD9ZFs/oNFWKSnPzvN6EqQI2dtSxxiycKjaxnwjKN7jmzNWe/5uzna0FIND4wgA=="; }; }; + "ra-test-3.18.3" = { + name = "ra-test"; + packageName = "ra-test"; + version = "3.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ra-test/-/ra-test-3.18.3.tgz"; + sha512 = "TcJgH1Eh1vMqW/QaoDf9ArFb15p4ToQRDntZofRF368/7xSXuuub1WdlLddGaRj2A4xITRUvnFyel7RVZ9QTtw=="; + }; + }; "ra-ui-materialui-3.18.3" = { name = "ra-ui-materialui"; packageName = "ra-ui-materialui"; @@ -8968,6 +9967,15 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; "rc-align-4.0.9" = { name = "rc-align"; packageName = "rc-align"; @@ -9121,6 +10129,15 @@ let sha512 = "U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA=="; }; }; + "react-error-boundary-3.1.3" = { + name = "react-error-boundary"; + packageName = "react-error-boundary"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.3.tgz"; + sha512 = "A+F9HHy9fvt9t8SNDlonq01prnU8AmkjvGKV4kk8seB9kU3xMEO8J/PQlLVmoOIDODl5U2kufSBs4vrWIqhsAA=="; + }; + }; "react-error-overlay-6.0.11" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -9202,6 +10219,15 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; + "react-is-17.0.1" = { + name = "react-is"; + packageName = "react-is"; + version = "17.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz"; + sha512 = "NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA=="; + }; + }; "react-is-17.0.2" = { name = "react-is"; packageName = "react-is"; @@ -9220,15 +10246,6 @@ let sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; }; }; - "react-jinke-music-player-4.24.2" = { - name = "react-jinke-music-player"; - packageName = "react-jinke-music-player"; - version = "4.24.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.24.2.tgz"; - sha512 = "E1ipg12CpIF2C54vnAD7Q14yr4UiwbQJo60DoF9dkU0gWRLgo60oLhjw4mRxlbERurkeR/9Ml1a9hUnIa8el/Q=="; - }; - }; "react-lifecycles-compat-3.0.4" = { name = "react-lifecycles-compat"; packageName = "react-lifecycles-compat"; @@ -9319,6 +10336,24 @@ let sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; }; }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -9346,13 +10381,22 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; - "recursive-readdir-2.2.2" = { + "recursive-readdir-2.2.3" = { name = "recursive-readdir"; packageName = "recursive-readdir"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz"; + sha512 = "8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA=="; + }; + }; + "redent-3.0.0" = { + name = "redent"; + packageName = "redent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; }; }; "redux-4.2.0" = { @@ -9454,6 +10498,24 @@ let sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; }; }; + "registry-auth-token-4.2.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; + }; + }; + "registry-url-5.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + }; + }; "regjsgen-0.7.1" = { name = "regjsgen"; packageName = "regjsgen"; @@ -9607,6 +10669,24 @@ let sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; }; }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; "retry-0.13.1" = { name = "retry"; packageName = "retry"; @@ -9652,6 +10732,15 @@ let sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; }; }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; @@ -9661,6 +10750,15 @@ let sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; + "rxjs-6.6.7" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -9805,6 +10903,15 @@ let sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; }; }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -9823,6 +10930,15 @@ let sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; + "semver-diff-3.1.1" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + }; + }; "send-0.18.0" = { name = "send"; packageName = "send"; @@ -9976,13 +11092,13 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "sortablejs-1.13.0" = { + "sortablejs-1.15.0" = { name = "sortablejs"; packageName = "sortablejs"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz"; - sha512 = "RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="; + url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz"; + sha512 = "bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="; }; }; "source-list-map-2.0.1" = { @@ -10057,6 +11173,42 @@ let sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; }; }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.9" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; + }; + }; "spdy-4.0.2" = { name = "spdy"; packageName = "spdy"; @@ -10165,6 +11317,15 @@ let sha512 = "n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="; }; }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; "string-width-4.2.2" = { name = "string-width"; packageName = "string-width"; @@ -10237,6 +11398,15 @@ let sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -10291,6 +11461,24 @@ let sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; + "strip-indent-3.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -10453,6 +11641,15 @@ let sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; }; }; + "term-size-2.2.1" = { + name = "term-size"; + packageName = "term-size"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz"; + sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; + }; + }; "terminal-link-2.1.1" = { name = "terminal-link"; packageName = "terminal-link"; @@ -10507,6 +11704,15 @@ let sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; }; }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; "thunky-1.1.0" = { name = "thunky"; packageName = "thunky"; @@ -10534,6 +11740,15 @@ let sha512 = "lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="; }; }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; "tmpl-1.0.5" = { name = "tmpl"; packageName = "tmpl"; @@ -10552,6 +11767,15 @@ let sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-regex-range-5.0.1" = { name = "to-regex-range"; packageName = "to-regex-range"; @@ -10597,6 +11821,15 @@ let sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; + "trim-newlines-3.0.1" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; + }; + }; "tryer-1.0.1" = { name = "tryer"; packageName = "tryer"; @@ -10678,6 +11911,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + }; "type-fest-0.16.0" = { name = "type-fest"; packageName = "type-fest"; @@ -10705,6 +11947,24 @@ let sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; "type-fest-2.19.0" = { name = "type-fest"; packageName = "type-fest"; @@ -10876,6 +12136,15 @@ let sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; }; }; + "update-notifier-4.1.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; + sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; + }; + }; "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; @@ -10894,6 +12163,15 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -10948,6 +12226,15 @@ let sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; "value-equal-1.0.1" = { name = "value-equal"; packageName = "value-equal"; @@ -11020,6 +12307,15 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -11200,6 +12496,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "widest-line-3.1.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + }; + }; "word-wrap-1.2.3" = { name = "word-wrap"; packageName = "word-wrap"; @@ -11245,6 +12550,15 @@ let sha512 = "DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug=="; }; }; + "workbox-cli-6.5.4" = { + name = "workbox-cli"; + packageName = "workbox-cli"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-cli/-/workbox-cli-6.5.4.tgz"; + sha512 = "+Cc0jYh25MofhCROZqfQkpYSAGvykyrUVekuuPaLFbJ8qxX/zzX8hRRpglfwxDwokAjz8S20oEph4s+MyQc+Yw=="; + }; + }; "workbox-core-6.5.4" = { name = "workbox-core"; packageName = "workbox-core"; @@ -11407,6 +12721,15 @@ let sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; }; }; + "xdg-basedir-4.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + }; + }; "xml-name-validator-3.0.0" = { name = "xml-name-validator"; packageName = "xml-name-validator"; @@ -11470,6 +12793,15 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -11495,6 +12827,7 @@ let version = "0.1.0"; src = ./.; dependencies = [ + sources."@adobe/css-tools-4.0.1" sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.19.3" @@ -11755,6 +13088,11 @@ let sources."chalk-4.1.2" ]; }) + (sources."@jest/types-26.6.2" // { + dependencies = [ + sources."chalk-4.1.0" + ]; + }) sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -11769,10 +13107,10 @@ let sources."@material-ui/core-4.11.4" sources."@material-ui/icons-4.11.2" sources."@material-ui/lab-4.0.0-alpha.58" - sources."@material-ui/styles-4.11.4" + sources."@material-ui/styles-4.11.5" sources."@material-ui/system-4.11.3" sources."@material-ui/types-5.1.0" - sources."@material-ui/utils-4.11.2" + sources."@material-ui/utils-4.11.3" (sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" // { dependencies = [ sources."eslint-scope-5.1.1" @@ -11802,6 +13140,7 @@ let }) sources."@rushstack/eslint-patch-1.2.0" sources."@sinclair/typebox-0.24.44" + sources."@sindresorhus/is-0.14.0" sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@svgr/babel-plugin-add-jsx-attribute-5.4.0" @@ -11818,8 +13157,31 @@ let sources."@svgr/plugin-jsx-5.5.0" sources."@svgr/plugin-svgo-5.5.0" sources."@svgr/webpack-5.5.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."@testing-library/dom-8.1.0" // { + dependencies = [ + sources."@jest/types-27.0.6" + sources."@types/yargs-16.0.4" + sources."chalk-4.1.1" + (sources."pretty-format-27.0.6" // { + dependencies = [ + sources."ansi-styles-5.2.0" + ]; + }) + sources."react-is-17.0.2" + ]; + }) + (sources."@testing-library/jest-dom-5.16.5" // { + dependencies = [ + sources."aria-query-5.0.2" + ]; + }) + sources."@testing-library/react-12.1.5" + sources."@testing-library/react-hooks-7.0.2" + sources."@testing-library/user-event-13.5.0" sources."@tootallnate/once-1.1.2" sources."@trysound/sax-0.2.0" + sources."@types/aria-query-4.2.2" sources."@types/babel__core-7.1.14" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" @@ -11841,10 +13203,13 @@ let sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" + sources."@types/jest-26.0.23" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" + sources."@types/minimist-1.2.2" sources."@types/node-14.0.27" + sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.1" sources."@types/prop-types-15.7.3" @@ -11856,7 +13221,9 @@ let sources."csstype-3.0.6" ]; }) + sources."@types/react-dom-17.0.5" sources."@types/react-redux-7.1.24" + sources."@types/react-test-renderer-17.0.1" sources."@types/react-transition-group-4.4.1" sources."@types/resolve-1.17.1" sources."@types/retry-0.12.0" @@ -11864,8 +13231,10 @@ let sources."@types/serve-static-1.15.0" sources."@types/sockjs-0.3.33" sources."@types/stack-utils-2.0.1" + sources."@types/testing-library__jest-dom-5.9.5" sources."@types/trusted-types-2.0.2" sources."@types/ws-8.5.3" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/eslint-plugin-5.38.1" sources."@typescript-eslint/experimental-utils-5.38.1" @@ -11916,6 +13285,15 @@ let ]; }) sources."ajv-keywords-3.5.2" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.1" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -11975,10 +13353,16 @@ let ]; }) sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" sources."batch-0.6.1" sources."bfj-7.0.2" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."buffer-5.7.1" + ]; + }) sources."bluebird-3.7.2" sources."blueimp-md5-2.19.0" (sources."body-parser-1.20.0" // { @@ -11990,6 +13374,11 @@ let }) sources."bonjour-service-1.0.14" sources."boolbase-1.0.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" @@ -11998,6 +13387,13 @@ let sources."buffer-from-1.1.1" sources."builtin-modules-3.2.0" sources."bytes-3.0.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + sources."normalize-url-4.5.1" + ]; + }) sources."call-bind-1.0.2" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { @@ -12007,17 +13403,31 @@ let }) sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001414" sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."chalk-3.0.0" sources."char-regex-1.0.2" + sources."chardet-0.7.0" sources."check-types-11.1.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" + sources."ci-info-2.0.0" sources."cjs-module-lexer-1.2.2" sources."classnames-2.2.6" sources."clean-css-5.3.1" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."clone-response-1.0.2" sources."clsx-1.1.1" sources."co-4.6.0" (sources."coa-2.0.2" // { @@ -12049,6 +13459,7 @@ let }) sources."compute-scroll-into-view-1.0.17" sources."concat-map-0.0.1" + sources."configstore-5.0.1" sources."confusing-browser-globals-1.0.11" sources."connect-history-api-fallback-2.0.0" sources."connected-react-router-6.9.1" @@ -12089,6 +13500,7 @@ let sources."css-tree-1.0.0-alpha.37" sources."css-vendor-2.0.8" sources."css-what-3.4.2" + sources."css.escape-1.5.1" sources."cssdb-7.0.1" sources."cssesc-3.0.0" sources."cssnano-5.1.13" @@ -12111,12 +13523,22 @@ let sources."data-urls-2.0.0" sources."date-fns-1.30.1" sources."debug-4.3.4" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) sources."decimal.js-10.4.1" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" + sources."decompress-response-3.3.0" sources."dedent-0.7.0" + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-4.2.2" sources."default-gateway-6.0.3" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" sources."defined-1.0.0" @@ -12134,12 +13556,14 @@ let sources."detective-5.2.1" sources."diacritic-0.0.2" sources."didyoumean-1.2.2" + sources."diff-sequences-26.6.2" sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."dnd-core-14.0.1" sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."doctrine-3.0.0" + sources."dom-accessibility-api-0.5.6" sources."dom-align-1.12.2" sources."dom-converter-0.2.0" (sources."dom-helpers-5.2.1" // { @@ -12169,17 +13593,20 @@ let sources."tslib-2.4.0" ]; }) + sources."dot-prop-5.3.0" sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."downloadjs-1.4.7" sources."downshift-3.2.7" sources."duplexer-0.1.2" + sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.267" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.10.0" sources."entities-2.2.0" sources."error-ex-1.3.2" @@ -12190,6 +13617,7 @@ let sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" + sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -12305,6 +13733,7 @@ let sources."safe-buffer-5.2.1" ]; }) + sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" @@ -12312,6 +13741,7 @@ let sources."fastq-1.13.0" sources."faye-websocket-0.11.4" sources."fb-watchman-2.0.2" + sources."figures-3.2.0" sources."file-entry-cache-6.0.1" (sources."file-loader-6.2.0" // { dependencies = [ @@ -12369,10 +13799,16 @@ let sources."get-node-dimensions-1.2.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-package-type-0.1.0" + sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" + (sources."global-dirs-2.1.0" // { + dependencies = [ + sources."ini-1.3.7" + ]; + }) sources."global-modules-2.0.0" (sources."global-prefix-3.0.0" // { dependencies = [ @@ -12381,10 +13817,12 @@ let }) sources."globals-11.12.0" sources."globby-11.1.0" + sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" + sources."hard-rejection-2.1.0" sources."harmony-reflect-1.6.2" sources."has-1.0.3" sources."has-bigints-1.0.2" @@ -12392,10 +13830,12 @@ let sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."has-yarn-2.1.0" sources."he-1.2.0" sources."history-4.10.1" sources."hoist-non-react-statics-3.3.2" sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" (sources."hpack.js-2.1.6" // { dependencies = [ sources."isarray-1.0.0" @@ -12415,6 +13855,7 @@ let sources."domutils-2.8.0" ]; }) + sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" sources."http-parser-js-0.5.8" @@ -12435,17 +13876,25 @@ let sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."identity-obj-proxy-3.0.0" + sources."ieee754-1.2.1" sources."ignore-5.2.0" sources."immer-9.0.15" sources."immutable-4.0.0-rc.12" sources."import-fresh-3.3.0" + sources."import-lazy-2.1.0" sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."indefinite-observable-2.0.1" + sources."indent-string-4.0.0" sources."inflection-1.13.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."internal-slot-1.0.3" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" @@ -12453,6 +13902,7 @@ let sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" + sources."is-ci-2.0.0" sources."is-core-module-2.10.0" sources."is-date-object-1.0.2" sources."is-docker-2.2.1" @@ -12461,11 +13911,20 @@ let sources."is-generator-fn-2.1.0" sources."is-glob-4.0.3" sources."is-in-browser-1.1.3" + (sources."is-installed-globally-0.3.2" // { + dependencies = [ + sources."is-path-inside-3.0.3" + ]; + }) + sources."is-interactive-1.0.0" sources."is-mobile-2.2.2" sources."is-module-1.0.0" sources."is-negative-zero-2.0.2" + sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-number-object-1.0.7" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" sources."is-potential-custom-element-name-1.0.1" sources."is-regex-1.1.4" sources."is-regexp-1.0.0" @@ -12475,8 +13934,10 @@ let sources."is-string-1.0.7" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" @@ -12536,6 +13997,11 @@ let sources."react-is-17.0.2" ]; }) + (sources."jest-diff-26.6.2" // { + dependencies = [ + sources."chalk-4.1.1" + ]; + }) sources."jest-docblock-27.5.1" (sources."jest-each-27.5.1" // { dependencies = [ @@ -12565,6 +14031,7 @@ let sources."chalk-4.1.2" ]; }) + sources."jest-get-type-26.3.0" (sources."jest-haste-map-27.5.1" // { dependencies = [ sources."@jest/types-27.5.1" @@ -12768,10 +14235,11 @@ let ]; }) sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.1" + sources."json5-2.2.3" sources."jsonexport-2.5.2" sources."jsonfile-6.1.0" (sources."jss-10.6.0" // { @@ -12788,17 +14256,19 @@ let sources."jss-plugin-vendor-prefixer-10.6.0" sources."jsx-ast-utils-3.3.3" sources."jwt-decode-3.1.2" + sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kleur-3.0.3" sources."klona-2.0.5" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" + sources."latest-version-5.1.0" sources."leven-3.1.0" sources."levn-0.4.1" sources."lilconfig-2.0.6" sources."lines-and-columns-1.1.6" sources."loader-runner-4.3.0" - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" @@ -12809,13 +14279,20 @@ let sources."lodash.sortby-4.7.0" sources."lodash.throttle-4.1.1" sources."lodash.uniq-4.5.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ sources."tslib-2.4.0" ]; }) + sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" + sources."lz-string-1.4.4" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ @@ -12823,9 +14300,25 @@ let ]; }) sources."makeerror-1.0.12" + sources."map-obj-4.3.0" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" sources."memfs-3.4.7" + (sources."meow-7.1.1" // { + dependencies = [ + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."type-fest-0.13.1" + ]; + }) sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -12835,6 +14328,8 @@ let sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."min-indent-1.0.1" sources."mini-create-react-context-0.4.1" (sources."mini-css-extract-plugin-2.6.1" // { dependencies = [ @@ -12847,11 +14342,22 @@ let sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."multicast-dns-7.2.5" + sources."mute-stream-0.0.8" sources."nanoid-3.3.4" sources."natural-compare-1.4.0" + (sources."navidrome-music-player-4.25.1" // { + dependencies = [ + sources."classnames-2.3.2" + ]; + }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { @@ -12863,6 +14369,11 @@ let sources."node-int64-0.4.0" sources."node-polyglot-2.4.2" sources."node-releases-2.0.6" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-6.1.0" @@ -12886,10 +14397,22 @@ let sources."onetime-5.1.2" sources."open-8.4.0" sources."optionator-0.9.1" + (sources."ora-5.4.1" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) + sources."os-tmpdir-1.0.2" + sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-retry-4.6.2" sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) (sources."param-case-3.0.4" // { dependencies = [ sources."tslib-2.4.0" @@ -13010,8 +14533,14 @@ let sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."prelude-ls-1.2.1" + sources."prettier-2.8.2" sources."pretty-bytes-5.6.0" sources."pretty-error-4.0.0" + (sources."pretty-format-26.6.2" // { + dependencies = [ + sources."react-is-17.0.1" + ]; + }) sources."process-nextick-args-2.0.1" sources."promise-8.2.0" sources."prompts-2.4.2" @@ -13026,12 +14555,15 @@ let ]; }) sources."psl-1.9.0" + sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.10.3" sources."query-string-5.1.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" (sources."ra-core-3.18.3" // { dependencies = [ sources."inflection-1.12.0" @@ -13040,6 +14572,13 @@ let sources."ra-data-json-server-3.18.3" sources."ra-i18n-polyglot-3.18.3" sources."ra-language-english-3.18.3" + (sources."ra-test-3.18.3" // { + dependencies = [ + sources."@testing-library/dom-7.31.2" + sources."@testing-library/react-11.2.7" + sources."chalk-4.1.1" + ]; + }) (sources."ra-ui-materialui-3.18.3" // { dependencies = [ sources."inflection-1.12.0" @@ -13053,6 +14592,11 @@ let sources."bytes-3.1.2" ]; }) + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."rc-align-4.0.9" sources."rc-motion-2.4.3" sources."rc-slider-9.7.2" @@ -13068,7 +14612,7 @@ let sources."chalk-4.1.2" sources."escape-string-regexp-4.0.0" sources."find-up-5.0.0" - sources."loader-utils-3.2.0" + sources."loader-utils-3.2.1" sources."locate-path-6.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -13080,6 +14624,7 @@ let sources."react-drag-listview-0.1.8" sources."react-draggable-4.4.3" sources."react-dropzone-10.2.2" + sources."react-error-boundary-3.1.3" sources."react-error-overlay-6.0.11" sources."react-final-form-6.5.3" sources."react-final-form-arrays-3.1.3" @@ -13088,11 +14633,6 @@ let sources."react-icons-4.4.0" sources."react-image-lightbox-5.1.4" sources."react-is-16.12.0" - (sources."react-jinke-music-player-4.24.2" // { - dependencies = [ - sources."classnames-2.3.1" - ]; - }) sources."react-lifecycles-compat-3.0.4" sources."react-measure-2.5.2" sources."react-modal-3.11.2" @@ -13121,11 +14661,8 @@ let sources."read-cache-1.0.0" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" - (sources."recursive-readdir-2.2.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."recursive-readdir-2.2.3" + sources."redent-3.0.0" sources."redux-4.2.0" sources."redux-saga-1.1.3" sources."regenerate-1.4.2" @@ -13136,6 +14673,8 @@ let sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."regexpu-core-5.2.1" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -13173,6 +14712,8 @@ let ]; }) sources."resolve.exports-1.1.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -13182,7 +14723,9 @@ let sources."serialize-javascript-4.0.0" ]; }) + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" @@ -13196,6 +14739,11 @@ let sources."select-hose-2.0.0" sources."selfsigned-2.1.1" sources."semver-7.3.7" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -13229,7 +14777,7 @@ let sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."sockjs-0.3.24" - sources."sortablejs-1.13.0" + sources."sortablejs-1.15.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -13240,6 +14788,10 @@ let }) sources."source-map-support-0.5.20" sources."sourcemap-codec-1.4.8" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.9" sources."spdy-4.0.2" sources."spdy-transport-3.0.0" sources."sprintf-js-1.0.3" @@ -13273,6 +14825,7 @@ let sources."strip-bom-4.0.0" sources."strip-comments-2.0.1" sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" sources."strip-json-comments-3.1.1" sources."style-loader-3.3.1" sources."stylehacks-5.1.0" @@ -13305,6 +14858,7 @@ let sources."type-fest-0.16.0" ]; }) + sources."term-size-2.2.1" sources."terminal-link-2.1.1" (sources."terser-5.15.0" // { dependencies = [ @@ -13322,11 +14876,14 @@ let sources."test-exclude-6.0.0" sources."text-table-0.2.0" sources."throat-6.0.1" + sources."through-2.3.8" sources."thunky-1.1.0" sources."tiny-invariant-1.1.0" sources."tiny-warning-1.0.3" + sources."tmp-0.0.33" sources."tmpl-1.0.5" sources."to-fast-properties-2.0.0" + sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" (sources."tough-cookie-4.1.2" // { @@ -13335,10 +14892,11 @@ let ]; }) sources."tr46-2.1.0" + sources."trim-newlines-3.0.1" sources."tryer-1.0.1" (sources."tsconfig-paths-3.14.1" // { dependencies = [ - sources."json5-1.0.1" + sources."json5-1.0.2" sources."strip-bom-3.0.0" ]; }) @@ -13346,6 +14904,7 @@ let sources."tsutils-3.21.0" sources."type-check-0.4.0" sources."type-detect-4.0.8" + sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."typescript-4.8.4" @@ -13363,8 +14922,14 @@ let sources."unquote-1.1.1" sources."upath-1.2.0" sources."update-browserslist-db-1.0.9" + sources."update-notifier-4.1.3" sources."uri-js-4.4.1" sources."url-parse-1.5.10" + (sources."url-parse-lax-3.0.0" // { + dependencies = [ + sources."prepend-http-2.0.0" + ]; + }) sources."util-deprecate-1.0.2" sources."util.promisify-1.0.1" sources."utila-0.4.0" @@ -13375,6 +14940,7 @@ let sources."source-map-0.7.4" ]; }) + sources."validate-npm-package-license-3.0.4" sources."value-equal-1.0.1" sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" @@ -13383,6 +14949,7 @@ let sources."warning-4.0.3" sources."watchpack-2.4.0" sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" (sources."webpack-5.74.0" // { dependencies = [ @@ -13424,6 +14991,7 @@ let sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."widest-line-3.1.0" sources."word-wrap-1.2.3" (sources."workbox-background-sync-6.5.4" // { dependencies = [ @@ -13448,6 +15016,11 @@ let ]; }) sources."workbox-cacheable-response-6.5.4" + (sources."workbox-cli-6.5.4" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."workbox-core-6.5.4" (sources."workbox-expiration-6.5.4" // { dependencies = [ @@ -13472,6 +15045,7 @@ let sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.5.9" + sources."xdg-basedir-4.0.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -13483,13 +15057,18 @@ let sources."yargs-parser-20.2.9" ]; }) + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { homepage = "."; }; - production = true; + production = false; bypassCache = true; reconstructLock = false; }; diff --git a/pkgs/servers/misc/navidrome/update.nix b/pkgs/servers/misc/navidrome/update.nix index c559aa31858a..124fbed4616b 100644 --- a/pkgs/servers/misc/navidrome/update.nix +++ b/pkgs/servers/misc/navidrome/update.nix @@ -22,7 +22,7 @@ writeScript "update-navidrome" '' tempDir=$(mktemp -d) cp $src/ui/package.json $src/ui/package-lock.json $tempDir cd $tempDir - node2nix -l package-lock.json -c node-composition.nix + node2nix -d -l package-lock.json -c node-composition.nix cp *.nix $uiDir rm -rf $tempDir '' diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 0529a2bb0716..6aefa4f45342 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/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/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 4162ea9d6ce3..72c18cd6d2ab 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { runHook preBuild ln -s ${nodeDependencies}/lib/node_modules . + export HOME=$(mktemp -d) export PATH="${nodeDependencies}/bin:$PATH" npm run build diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/servers/monitoring/cockpit/default.nix new file mode 100644 index 000000000000..76f2f777f60c --- /dev/null +++ b/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/pkgs/servers/monitoring/cockpit/fix-makefiles.patch b/pkgs/servers/monitoring/cockpit/fix-makefiles.patch new file mode 100644 index 000000000000..a22eb9f00ea8 --- /dev/null +++ b/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/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch b/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch new file mode 100644 index 000000000000..36b0e3861a4a --- /dev/null +++ b/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/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 952a9f94ceba..e356b914c39c 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -12,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-5oER0KMhBBu8AiawxHNoYIV+farcLBjB8HpO+1UluSY="; + sha256 = "sha256-CWA2xmVWvPeKCvssQAMHMYJ3CxJ7sIC7GX3qb3QFLuA="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 70ac2f3ab9fd..812bd159a5f2 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/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/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 52f4ab6e2fa0..9858cdd818e5 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/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/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index ad2eb3691314..e7c606dae54f 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.71"; + version = "2.0.72"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-RIWZpvC4bVrm5DXnWyBw7/57oZR+Z3m+NfjmSjLSKi0="; + sha256 = "sha256-w2/S7MnL/LFYzNFtC2YbBjJRhVA5kLvwd3IWVHC+o9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index a58ec2bf7b29..edf82742bc53 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; - CFLAGS = "-ldl"; # Do not create /var directories preInstall = '' diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 5f951f308ddc..17775b491c64 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.11.0"; + version = "1.12.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-dUAIPS2o+uvCGX32AgknynT0Mzzbq/7SeNmKN0Xc69o="; + hash = "sha256-EFjWDoWPePbPX9j4vuI41TAlGcFRlUyPpSvJriZdR0U="; }; vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index f1044ca4f816..95fd5135b4c1 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,9 +5,9 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.9.0"; + version = "0.9.1"; - disabled = python3.pythonOlder "3.7"; + disabled = python3.pythonOlder "3.8"; format = "pyproject"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-OUeTOnb9ZhdJWzO+Wzl+liv4u3mlbyJ4tWyCHU5loqc="; + hash = "sha256-o22Jn2x2mFczjQTttKEfrzGBAKpXSe9JT8kIA5WGjmA="; }; pythonRelaxDeps = true; diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 783c4e1b72dd..f4b96b1cf7a8 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/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/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index d05afd220533..ce859d669c6a 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/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/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 9538872fb2c7..be3b102bfbe5 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/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/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 969292d6700b..5184d2c6408e 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/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/pkgs/servers/monitoring/uptime-kuma/composition.nix b/pkgs/servers/monitoring/uptime-kuma/composition.nix deleted file mode 100644 index ca76a98f5a65..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 943ee9ce1589..a5e11ac8a10b 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -1,19 +1,17 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }: -let - deps = import ./composition.nix { inherit pkgs; }; -in -stdenv.mkDerivation (finalAttrs: { +{ pkgs, lib, fetchFromGitHub, buildNpmPackage, python3, nodejs, nixosTests }: + +buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.19.6"; + version = "1.20.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; - rev = finalAttrs.version; - sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; + rev = version; + sha256 = "sha256-dMjhCsTjXOwxhvJeL25KNkFhRCbCuxG7Ccz8mP7P38A="; }; - uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; + npmDepsHash = "sha256-Ks6KYHP6+ym9PGJ1a5nMxT7JXZyknHeaCmAkjJuCTXU="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,35 +19,21 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ python3 ]; - installPhase = '' - mkdir -p $out/share/ - cp -r server $out/share/ - cp -r db $out/share/ - cp -r src $out/share/ - cp package.json $out/share/ - ln -s ${deps.package}/lib/node_modules/uptime-kuma/node_modules/ $out/share/ - ln -s ${finalAttrs.passthru.ui} $out/share/dist + CYPRESS_INSTALL_BINARY = 0; # Stops Cypress from trying to download binaries + + postInstall = '' + cp -r dist $out/lib/node_modules/uptime-kuma/ ''; postFixup = '' makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \ - --add-flags $out/share/server/server.js \ - --chdir $out/share/ + --add-flags $out/lib/node_modules/uptime-kuma/server/server.js \ + --chdir $out/lib/node_modules/uptime-kuma ''; - passthru = { - tests.uptime-kuma = nixosTests.uptime-kuma; - - updateScript = ./update.sh; - - ui = fetchzip { - name = "uptime-kuma-dist-${finalAttrs.version}"; - url = "https://github.com/louislam/uptime-kuma/releases/download/${finalAttrs.version}/dist.tar.gz"; - sha256 = finalAttrs.uiSha256; - }; - }; + passthru.tests.uptime-kuma = nixosTests.uptime-kuma; meta = with lib; { description = "A fancy self-hosted monitoring tool"; @@ -57,5 +41,4 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ julienmalka ]; }; -}) - +} diff --git a/pkgs/servers/monitoring/uptime-kuma/node-env.nix b/pkgs/servers/monitoring/uptime-kuma/node-env.nix deleted file mode 100644 index 5dad9ec63d47..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=16.*" - }, - "scripts": { - "install-legacy": "npm install", - "update-legacy": "npm update", - "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .", - "lint-fix:js": "eslint --ext \".js,.vue\" --fix --ignore-path .gitignore .", - "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore", - "lint-fix:style": "stylelint \"**/*.{vue,css,scss}\" --fix --ignore-path .gitignore", - "lint": "npm run lint:js && npm run lint:style", - "dev": "concurrently -k -r \"wait-on tcp:3000 && npm run start-server-dev \" \"npm run start-frontend-dev\"", - "start-frontend-dev": "cross-env NODE_ENV=development vite --host --config ./config/vite.config.js", - "start": "npm run start-server", - "start-server": "node server/server.js", - "start-server-dev": "cross-env NODE_ENV=development node server/server.js", - "build": "vite build --config ./config/vite.config.js", - "test": "node test/prepare-test-server.js && npm run jest-backend", - "test-with-build": "npm run build && npm test", - "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js", - "tsc": "tsc", - "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", - "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", - "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", - "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", - "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", - "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", - "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", - "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", - "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push", - "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", - "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", - "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", - "download-dist": "node extra/download-dist.js", - "mark-as-nightly": "node extra/mark-as-nightly.js", - "reset-password": "node extra/reset-password.js", - "remove-2fa": "node extra/remove-2fa.js", - "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1", - "test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .", - "test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .", - "test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .", - "test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .", - "test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .", - "simple-dns-server": "node extra/simple-dns-server.js", - "simple-mqtt-server": "node extra/simple-mqtt-server.js", - "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix", - "ncu-patch": "npm-check-updates -u -t patch", - "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js", - "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", - "git-remove-tag": "git tag -d", - "build-dist-and-restart": "npm run build && npm run start-server-dev", - "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", - "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", - "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", - "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", - "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", - "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" - }, - "dependencies": { - "@grpc/grpc-js": "~1.7.3", - "@louislam/ping": "~0.4.2-mod.1", - "@louislam/sqlite3": "15.1.2", - "args-parser": "~1.3.0", - "axios": "~0.27.0", - "axios-ntlm": "1.3.0", - "badge-maker": "~3.3.1", - "bcryptjs": "~2.4.3", - "bree": "~7.1.5", - "cacheable-lookup": "~6.0.4", - "chardet": "~1.4.0", - "check-password-strength": "^2.0.5", - "cheerio": "~1.0.0-rc.12", - "chroma-js": "~2.4.2", - "command-exists": "~1.2.9", - "compare-versions": "~3.6.0", - "compression": "~1.7.4", - "dayjs": "~1.11.5", - "express": "~4.17.3", - "express-basic-auth": "~1.2.1", - "express-static-gzip": "~2.1.7", - "form-data": "~4.0.0", - "http-graceful-shutdown": "~3.1.7", - "http-proxy-agent": "~5.0.0", - "https-proxy-agent": "~5.0.1", - "iconv-lite": "~0.6.3", - "jsesc": "~3.0.2", - "jsonwebtoken": "~9.0.0", - "jwt-decode": "~3.1.2", - "limiter": "~2.1.0", - "mqtt": "~4.3.7", - "mssql": "~8.1.4", - "mysql2": "~2.3.3", - "node-cloudflared-tunnel": "~1.0.9", - "node-radius-client": "~1.0.0", - "nodemailer": "~6.6.5", - "notp": "~2.0.3", - "password-hash": "~1.2.2", - "pg": "~8.8.0", - "pg-connection-string": "~2.5.0", - "prom-client": "~13.2.0", - "prometheus-api-metrics": "~3.2.1", - "protobufjs": "~7.1.1", - "redbean-node": "~0.2.0", - "socket.io": "~4.5.3", - "socket.io-client": "~4.5.3", - "socks-proxy-agent": "6.1.1", - "tar": "~6.1.11", - "tcp-ping": "~0.1.1", - "thirty-two": "~1.0.2" - }, - "devDependencies": { - "@actions/github": "~5.0.1", - "@babel/eslint-parser": "~7.17.0", - "@babel/preset-env": "^7.15.8", - "@fortawesome/fontawesome-svg-core": "~1.2.36", - "@fortawesome/free-regular-svg-icons": "~5.15.4", - "@fortawesome/free-solid-svg-icons": "~5.15.4", - "@fortawesome/vue-fontawesome": "~3.0.0-5", - "@popperjs/core": "~2.10.2", - "@types/bootstrap": "~5.1.9", - "@vitejs/plugin-legacy": "~2.1.0", - "@vitejs/plugin-vue": "~3.1.0", - "@vue/compiler-sfc": "~3.2.36", - "@vuepic/vue-datepicker": "~3.4.8", - "aedes": "^0.46.3", - "babel-plugin-rewire": "~1.2.0", - "bootstrap": "5.1.3", - "chart.js": "~3.6.2", - "chartjs-adapter-dayjs": "~1.0.0", - "concurrently": "^7.1.0", - "core-js": "~3.26.1", - "cross-env": "~7.0.3", - "cypress": "^10.1.0", - "delay": "^5.0.0", - "dns2": "~2.0.1", - "eslint": "~8.14.0", - "eslint-plugin-vue": "~8.7.1", - "favico.js": "~0.3.10", - "jest": "~27.2.5", - "postcss-html": "~1.5.0", - "postcss-rtlcss": "~3.7.2", - "postcss-scss": "~4.0.4", - "prismjs": "~1.29.0", - "qrcode": "~1.5.0", - "rollup-plugin-visualizer": "^5.6.0", - "sass": "~1.42.1", - "stylelint": "~14.7.1", - "stylelint-config-standard": "~25.0.0", - "terser": "~5.15.0", - "timezones-list": "~3.0.1", - "typescript": "~4.4.4", - "v-pagination-3": "~0.1.7", - "vite": "~3.1.0", - "vite-plugin-compression": "^0.5.1", - "vue": "next", - "vue-chart-3": "3.0.9", - "vue-confirm-dialog": "~1.0.2", - "vue-contenteditable": "~3.0.4", - "vue-i18n": "~9.2.2", - "vue-image-crop-upload": "~3.0.3", - "vue-multiselect": "~3.0.0-alpha.2", - "vue-prism-editor": "~2.0.0-alpha.2", - "vue-qrcode": "~1.0.0", - "vue-router": "~4.0.14", - "vue-toastification": "~2.0.0-rc.5", - "vuedraggable": "~4.1.0", - "wait-on": "^6.0.1" - } -} diff --git a/pkgs/servers/monitoring/uptime-kuma/update.sh b/pkgs/servers/monitoring/uptime-kuma/update.sh deleted file mode 100755 index 3bc5fb558863..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq - -set -euo pipefail - -latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/louislam/uptime-kuma/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; uptime-kuma.version or (lib.getVersion uptime-kuma)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "uptime-kuma is up-to-date: $currentVersion" - exit 0 -fi - -update-source-version uptime-kuma 0 0000000000000000000000000000000000000000000000000000000000000000 -update-source-version uptime-kuma "$latestVersion" - -store_src="$(command nix-build . -A uptime-kuma.src --no-out-link)" - -cd "$(dirname "${BASH_SOURCE[0]}")" - -node2nix \ - --nodejs-16 \ - --lock "$store_src/package-lock.json" \ - --composition ./composition.nix - - diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index b52015e1c3df..4c34f2719186 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/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/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index c46568d24da1..73595e6909ce 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -20,13 +20,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2022-04-23"; + version = "unstable-2022-11-18"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "cd520ba91728abb5a3d959269fbd8e4f40d1eb0b"; - sha256 = "sha256-sopX9t+LjYldx+syKwU3I0x/VYy4hLyXfitG0uumayE="; + rev = "362bc1a3d3ad397416f7fc48b8efe33837428b90"; + sha256 = "sha256-cebRHOx2hg470jM1CoQAk13Whv+KN2qx97BTlpjxSZg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index db2a6da7e5c6..76cbb2730cbb 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.11"; + version = "2.9.14"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM="; + hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI="; }; - vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc="; + vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 29edb77fabd0..391644379ef3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/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/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 7b45c83af8a1..0b775a81e88a 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/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/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index e6051ccb13b2..98ab7ebe3e24 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/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/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json deleted file mode 100644 index e3a075c7c8e0..000000000000 --- a/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/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch deleted file mode 100644 index 28af5ec76580..000000000000 --- a/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/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 58c4dd42936e..87ce4ce1889f 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nfd"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = lib.toUpper pname; rev = "NFD-${version}"; - sha256 = "sha256-8Zm8oxbpw9qD31NuofDdgPYnTWIz5E04NhkZhiRkK9E="; + sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; fetchSubmodules = true; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket"; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Networking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ lib.maintainers.bertof ]; + maintainers = with maintainers; [ bertof ]; }; } diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 77f4aa5a300e..c89d3f789e15 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,29 +5,32 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.7.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-i3XCYVJfZ2sF4XGOxaBZqBOw7nRdzcGKhNNdqQMccPU="; + sha256 = "sha256-iqoz7axU5U6MdRl8I2vS3Nh37XZZPI4bRb3oFxpQs6M="; }; postPatch = '' - echo ${version} > internal/util/version/gen/version.txt + echo v${version} > build/version/version.txt + echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-qyAc5EVg8QPTnXQjqJGpT3waDrfn8iXz+O1iESCzCIc="; + vendorSha256 = "sha256-qtxR1vk/EZZmCRP1Z+EFObfMbQXKiRaSiI1Dsv268b8="; CGO_ENABLED = 0; subPackages = [ "cmd/ferretdb" ]; + tags = [ "ferretdb_tigris" ]; + meta = with lib; { description = "A truly Open Source MongoDB alternative"; - homepage = "https://github.com/FerretDB/FerretDB"; + homepage = "https://www.ferretdb.io/"; license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya noisersup ]; }; } diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 185c246e6fac..a80975926e8d 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -33,7 +33,7 @@ let Version: ${libflux_version} Description: Library for the InfluxData Flux engine Cflags: -I/out/include - Libs: -L/out/lib -lflux -ldl -lpthread + Libs: -L/out/lib -lflux -lpthread ''; passAsFile = [ "pkgcfg" ]; postInstall = '' diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 41bba89996bf..4f86cc4da530 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -51,7 +51,7 @@ let Version: ${libflux_version} Description: Library for the InfluxData Flux engine Cflags: -I/out/include - Libs: -L/out/lib -lflux -ldl -lpthread + Libs: -L/out/lib -lflux -lpthread ''; passAsFile = [ "pkgcfg" ]; postInstall = '' diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index d6e2f20ecdbe..8ebed1c27464 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation { ) '' + optionalString withTsm '' export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\"" - export XBSA_XLIBS="-ldl" ''; buildFlags = [ "all_nolibafs" ]; diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 1253a6ef8fc3..47ca62c6d01e 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.74.3"; + version = "1.75.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "2+/5I0dpQsmoWA7Q0dCgPO85dkOKQWHeO34cueH4sjQ="; + sha256 = "ZR4gEE+bLVjcGxhoRYQqfxDjk0ulPmdb5IV041qf954="; }; yarnCache = stdenv.mkDerivation { @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-4B/ESi4lM2p+pY0dfUKWgwmYkwqPYaNuCLJ99ByjwWE="; + outputHash = "sha256-KcGhHFglBJDyircYUxpsMLRtQblYx3u/BMQq35A0qhE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index ed163f2547df..cddda5d399f2 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + "-Wno-error=uninitialized" + ]; + postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; meta = { diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 3cee78f571ee..abc89d8e8129 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.30.2.6563-3d4dc0cce"; + version = "1.31.0.6654-02189b09f"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0sz6xc484flh1cnlrvwin7x34bl118yy2mwj034f8p9ngiy5hrkw"; + sha256 = "sha256-ttkvYD+ALxfZpQutI1VyTbmQi/7hmvZ+YMUv3lskeWU="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0ymxfy3s9nygv9syiy2bdwmjfqg8m4i5n8c37z1ib6393iwj8mgi"; + sha256 = "sha256-TTEcyIBFiuJTNHeJ9wu+4o2ol72oCvM9FdDPC83J3Mc="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 357da5292821..a17e2ecd3cc9 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/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/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index e03d6e6827a1..7ad43825b151 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "3.0"; + version = "3.1"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg"; + sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg="; }; buildInputs = [ libressl libxcrypt ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 6dde194f92ea..12df9c02d071 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ 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-Xx2z5aiIKRNbBxBMXCTfm1VacQOLyruC6sXB/+C7knk="; + arm64-linux_hash = "sha256-r6WuQhydSRZmsH1hp51gGcQ/7ZruxbEMrbrFps2nmcw="; + x64-osx_hash = "sha256-F8bE4lXcqyBVZhgYcQKPrza9cphCuC5j7968jL6qgxM="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "1.1.2.2453"; + version = "1.2.0.2583"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 57977ebf4096..0c15e21f5a36 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,7 +36,7 @@ }: stdenv.mkDerivation rec { - pname = "${if libOnly then "lib" else ""}pulseaudio"; + pname = "${lib.optionalString libOnly "lib"}pulseaudio"; version = "16.1"; src = fetchurl { diff --git a/pkgs/servers/redpanda/base64.nix b/pkgs/servers/redpanda/base64.nix new file mode 100644 index 000000000000..305456c55ccf --- /dev/null +++ b/pkgs/servers/redpanda/base64.nix @@ -0,0 +1,26 @@ +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +}: +let + pname = "base64"; + version = "0.5.0"; +in +clangStdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "aklomp"; + repo = "base64"; + rev = "v${version}"; + sha256 = "sha256-2HNI9ycT9f+NLwLElEuR61qmTguOsI+kNxv01ipxSqQ="; + }; + nativeBuildInputs = [ cmake ]; + meta = with lib; { + description = "Fast Base64 stream encoder/decoder in C99, with SIMD acceleration"; + license = licenses.bsd2; + homepage = "https://github.com/aklomp/base64"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index e2a265c0f5ef..c59aa621cc4d 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,48 +1,52 @@ -{ lib, stdenv, fetchzip }: - +{ buildGoModule +, callPackage +, doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. +, fetchFromGitHub +, installShellFiles +, lib +, stdenv +}: let - version = "22.3.11"; - platform = if stdenv.isLinux then "linux" else "darwin"; - arch = if stdenv.isAarch64 then "arm" else "amd"; - sha256s = { - darwin.amd = "sha256-kwAKxFg7BSNInvsQvFqgtpq8EEwSnmDeDyaF5b8L8SQ="; - darwin.arm = "sha256-kH5Ii672SeAIiRcWuAO3oVJVSBWp+r78RmTiR3BaDbg="; - linux.amd = "sha256-EKgkRKBrM4+X2YGoP2LpWRHL+fdHu44LYwCZ+O+c5ZY="; - linux.arm = "sha256-9b4oerRXjUVUYoswJWtnMBJSQDoCKClf673VjDQFUAw="; + version = "22.3.13"; + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "redpanda"; + rev = "v${version}"; + sha256 = "sha256-cUQFDXWnQYSLcfKFYg6BLrxF77iX+Yx3hcul4tMxdoc="; }; -in stdenv.mkDerivation rec { - pname = "redpanda"; - inherit version; + server = callPackage ./server.nix { inherit src version; }; +in +buildGoModule rec { + pname = "redpanda-rpk"; + inherit doCheck src version; + modRoot = "./src/go/rpk"; + runVend = false; + vendorSha256 = "sha256-JVZuHRh3gavIGArxDkqUQsL5oBjz35EKGsC75Sy+cMo="; - src = fetchzip { - url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip"; - sha256 = sha256s.${platform}.${arch}; - }; + ldflags = [ + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.rev=v${version}"'' + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/container/common.tag=v${version}"'' + ]; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installShellFiles ]; - mkdir -p $out/bin - cp rpk $out/bin - - ${lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/rpk - ''} - - runHook postInstall + postInstall = '' + for shell in bash fish zsh; do + $out/bin/rpk generate shell-completion $shell > rpk.$shell + installShellCompletion rpk.$shell + done ''; - # stripping somehow completely breaks it - dontStrip = true; + passthru = { + inherit server; + }; meta = with lib; { - description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! "; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsl11; + description = "Redpanda client"; homepage = "https://redpanda.com/"; - maintainers = with maintainers; [ happysalada ]; + license = licenses.bsl11; + maintainers = with maintainers; [ avakhrenev happysalada ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/redpanda/hdr-histogram.nix b/pkgs/servers/redpanda/hdr-histogram.nix new file mode 100644 index 000000000000..91000649e130 --- /dev/null +++ b/pkgs/servers/redpanda/hdr-histogram.nix @@ -0,0 +1,28 @@ +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +, zlib +}: +let + pname = "HdrHistogram_c"; + version = "0.11.5"; +in +clangStdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "HdrHistogram"; + repo = "HdrHistogram_c"; + rev = version; + sha256 = "sha256-29if+0H8wdpQBN48lt0ylGgtUCv/tJYZnG5LzcIqXDs="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + meta = with lib; { + description = "C port of the HdrHistogram"; + license = licenses.bsd2; + homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/rapidjson.nix b/pkgs/servers/redpanda/rapidjson.nix new file mode 100644 index 000000000000..99ada8c05f88 --- /dev/null +++ b/pkgs/servers/redpanda/rapidjson.nix @@ -0,0 +1,32 @@ +# rapidjson used in nixpkgs is too old. Although it is technically a latest release, it was made in 2016. +# Redpanda uses its own version +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +, pkg-config +}: + +clangStdenv.mkDerivation rec { + pname = "rapidjson"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "rapidjson"; + rev = "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d"; + sha256 = "sha256-wggyCL5uEsnJDxkYAUsXOjoO1MNQBGB05E6aSpsNcl0="; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + + doCheck = false; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + maintainers = with maintainers; [ avakhrenev ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/redpanda.patch b/pkgs/servers/redpanda/redpanda.patch new file mode 100644 index 000000000000..c3ee76d3c9ae --- /dev/null +++ b/pkgs/servers/redpanda/redpanda.patch @@ -0,0 +1,73 @@ +diff --git a/cmake/main.cmake b/cmake/main.cmake +index 8c60c4214..194f33a21 100644 +--- a/cmake/main.cmake ++++ b/cmake/main.cmake +@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_UNITY_BUILD_BATCH_SIZE 10) + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +-list(APPEND BASE_LD_FLAGS_LIST +- -L${REDPANDA_DEPS_INSTALL_DIR}/lib +- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64 +- -fuse-ld=lld) +-set(PKG_CONFIG_PATH_LIST +- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig +- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig +- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig +- ) + + list(APPEND BASE_CXX_FLAGS_LIST -fPIC) + list(APPEND BASE_C_FLAGS_LIST -fPIC) +diff --git a/cmake/testing.cmake b/cmake/testing.cmake +index 7f149dc82..7c57aa3dd 100644 +--- a/cmake/testing.cmake ++++ b/cmake/testing.cmake +@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}") + message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}") + + function (rp_test) ++ return() + set(options + INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST) + set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eecd145ed..b9efa89b5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -5,4 +5,5 @@ find_package(Boost REQUIRED + unit_test_framework) + find_package(absl REQUIRED) + add_subdirectory(v) +-add_subdirectory(go/kreq-gen) ++# Don't build kafka-request-generator, it is needed only for tests ++# add_subdirectory(go/kreq-gen) +diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt +index 075da485e..af7ede2bc 100644 +--- a/src/v/CMakeLists.txt ++++ b/src/v/CMakeLists.txt +@@ -58,7 +58,9 @@ else() + if(${ENABLE_GIT_HASH}) + message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'") + endif() +- set(GIT_VER "no_version") ++ if(NOT GIT_VER) ++ set(GIT_VER "no_version") ++ endif() + endif() + + if(${ENABLE_GIT_HASH}) +@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH}) + set(GIT_CLEAN_DIRTY "") + endif() + else() +- set(GIT_SHA1 "000") +- set(GIT_CLEAN_DIRTY "-dev") ++ if(NOT GIT_SHA1) ++ set(GIT_SHA1 "000") ++ endif() ++ if(NOT GIT_CLEAN_DIRTY) ++ set(GIT_CLEAN_DIRTY "-dev") ++ endif() + endif() + + configure_file(version.h.in version.h @ONLY) diff --git a/pkgs/servers/redpanda/seastar-fixes.patch b/pkgs/servers/redpanda/seastar-fixes.patch new file mode 100644 index 000000000000..c6b12b88c149 --- /dev/null +++ b/pkgs/servers/redpanda/seastar-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/include/seastar/core/std-coroutine.hh b/include/seastar/core/std-coroutine.hh +index ea364bee..57474529 100644 +--- a/include/seastar/core/std-coroutine.hh ++++ b/include/seastar/core/std-coroutine.hh +@@ -87,7 +87,7 @@ class coroutine_handle { + + explicit operator bool() const noexcept { return _pointer; } + +- static coroutine_handle from_address(void* ptr) noexcept { ++ static constexpr coroutine_handle from_address(void* ptr) noexcept { + coroutine_handle hndl; + hndl._pointer = ptr; + return hndl; diff --git a/pkgs/servers/redpanda/seastar.nix b/pkgs/servers/redpanda/seastar.nix new file mode 100644 index 000000000000..3c7120e6c876 --- /dev/null +++ b/pkgs/servers/redpanda/seastar.nix @@ -0,0 +1,84 @@ +{ boost175 +, c-ares +, cmake +, cryptopp +, fetchFromGitHub +, fmt_8 +, gnutls +, hwloc +, lib +, libsystemtap +, libtasn1 +, liburing +, libxfs +, lksctp-tools +, llvmPackages_14 +, lz4 +, ninja +, numactl +, openssl +, pkg-config +, python3 +, ragel +, valgrind +, yaml-cpp +}: +let + pname = "seastar"; + version = "22.11.0"; +in +llvmPackages_14.stdenv.mkDerivation { + inherit pname version; + strictDeps = true; + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "seastar"; + rev = "30d3a28bde08d2228b4e560c173b89fdd94c3f05"; + sha256 = "sha256-Xzu7AJMkvE++BGEqluod3fwMEIpDnbCczmlEad0/4v4="; + }; + nativeBuildInputs = [ + cmake + ninja + openssl + pkg-config + python3 + ragel + ]; + buildInputs = [ + libsystemtap + libxfs + ]; + propagatedBuildInputs = [ + boost175 + c-ares + gnutls + cryptopp + fmt_8 + hwloc + libtasn1 + liburing + lksctp-tools + lz4 + numactl + valgrind + yaml-cpp + ]; + patches = [ + ./seastar-fixes.patch + ]; + postPatch = '' + patchShebangs ./scripts/seastar-json2code.py + ''; + cmakeFlags = [ + "-DSeastar_EXCLUDE_DEMOS_FROM_ALL=ON" + "-DSeastar_EXCLUDE_TESTS_FROM_ALL=ON" + ]; + doCheck = false; + meta = with lib; { + description = "High performance server-side application framework."; + license = licenses.asl20; + homepage = "https://seastar.io/"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix new file mode 100644 index 000000000000..9cb050eb5f45 --- /dev/null +++ b/pkgs/servers/redpanda/server.nix @@ -0,0 +1,123 @@ +{ abseil-cpp +, avro-cpp +, callPackage +, ccache +, cmake +, crc32c +, croaring +, ctre +, curl +, dpdk +, git +, lib +, llvmPackages_14 +, llvm_14 +, ninja +, p11-kit +, pkg-config +, procps +, protobuf3_21 +, python3 +, snappy +, src +, unzip +, version +, writeShellScriptBin +, xxHash +, zip +, zstd +}: +let + pname = "redpanda"; + pythonPackages = p: with p; [ jinja2 ]; + seastar = callPackage ./seastar.nix { }; + base64 = callPackage ./base64.nix { }; + hdr-histogram = callPackage ./hdr-histogram.nix { }; + kafka-codegen-venv = python3.withPackages (ps: [ + ps.jinja2 + ps.jsonschema + ]); + rapidjson = callPackage ./rapidjson.nix { }; +in +llvmPackages_14.stdenv.mkDerivation rec { + inherit pname version src; + + preConfigure = '' + # setup sccache + export CCACHE_DIR=$TMPDIR/sccache-redpanda + mkdir -p $CCACHE_DIR + ''; + patches = [ + ./redpanda.patch + ]; + postPatch = '' + # Fix 'error: use of undeclared identifier 'roaring'; did you mean 'Roaring + # qualified reference to 'Roaring' is a constructor name rather than a type in this context' + substituteInPlace \ + ./src/v/storage/compacted_offset_list.h \ + ./src/v/storage/compaction_reducers.cc \ + ./src/v/storage/compaction_reducers.h \ + ./src/v/storage/segment_utils.h \ + ./src/v/storage/segment_utils.cc \ + --replace 'roaring::Roaring' 'Roaring' + + patchShebangs ./src/v/rpc/rpc_compiler.py + ''; + + doCheck = false; + + nativeBuildInputs = [ + (python3.withPackages pythonPackages) + (writeShellScriptBin "kafka-codegen-venv" "exec -a $0 ${kafka-codegen-venv}/bin/python3 $@") + ccache + cmake + curl + git + llvm_14 + ninja + pkg-config + procps + seastar + unzip + zip + ]; + + cmakeFlags = [ + "-DREDPANDA_DEPS_SKIP_BUILD=ON" + "-DRP_ENABLE_TESTS=OFF" + "-Wno-dev" + "-DGIT_VER=${version}" + "-DGIT_CLEAN_DIRTY=\"\"" + ]; + + buildInputs = [ + abseil-cpp + avro-cpp + base64 + crc32c + croaring + ctre + dpdk + hdr-histogram + p11-kit + protobuf3_21 + rapidjson + seastar + snappy + xxHash + zstd + ]; + + meta = with lib; { + description = "Kafka-compatible streaming platform."; + license = licenses.bsl11; + longDescription = '' + Redpanda is a Kafka-compatible streaming data platform that is + proven to be 10x faster and 6x lower in total costs. It is also JVM-free, + ZooKeeper-free, Jepsen-tested and source available. + ''; + homepage = "https://redpanda.com/"; + maintainers = with maintainers; [ avakhrenev happysalada ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 775850ea32e0..7edc3dd89b2a 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -5,7 +5,7 @@ let pname = "roapi-http"; version = "0.6.0"; - target = if stdenv.isDarwin then "apple-darwin" else ""; + target = lib.optionalString stdenv.isDarwin "apple-darwin"; in # TODO build from source, currently compilation fails on darwin on snmalloc with # ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 8cc792f14592..c4987cdd2886 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/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/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 531a2e31a4b2..a0a6eb72e743 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/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/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index df235abe98c4..4828e613595a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,9 +20,12 @@ , gnutls , systemd , samba +, talloc , jansson +, ldb , libtasn1 , tdb +, tevent , libxcrypt , cmocka , rpcsvc-proto @@ -48,11 +51,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" ]; @@ -100,8 +103,11 @@ stdenv.mkDerivation rec { libarchive zlib gnutls + ldb + talloc libtasn1 tdb + tevent libxcrypt ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optionals stdenv.isDarwin [ libiconv ] @@ -143,6 +149,7 @@ stdenv.mkDerivation rec { ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" + "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb" ] ++ optional enableLibunwind "--with-libunwind" ++ optional enableProfiling "--with-profiling-data" ++ optional (!enableAcl) "--without-acl-support" diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix new file mode 100644 index 000000000000..b49be53ec207 --- /dev/null +++ b/pkgs/servers/search/khoj/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchFromGitHub +, python3Packages +, qt6 +}: + +python3Packages.buildPythonApplication rec { + pname = "khoj"; + version = "0.2.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "debanjum"; + repo = "khoj"; + rev = "refs/tags/${version}"; + hash = "sha256-QcxP+USj7vlLKPno2mV53nFonZM38VzL8D4zY6d8y3k="; + }; + + 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/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index c6878df1e04a..3b568df12b53 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/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/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix new file mode 100644 index 000000000000..b8274d894b27 --- /dev/null +++ b/pkgs/servers/search/opensearch/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jre_headless +, util-linux +, gnugrep +, coreutils +, autoPatchelfHook +, zlib +, nixosTests +}: + +stdenvNoCC.mkDerivation rec { + pname = "opensearch"; + version = "2.5.0"; + + src = fetchurl { + url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; + hash = "sha256-WPD5StVBb/hK+kP/1wkQQBKRQma/uaP+8ULeIFUBL1U="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ]; + patches = [./opensearch-home-fix.patch ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R bin config lib modules plugins $out + + substituteInPlace $out/bin/opensearch \ + --replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore" + + wrapProgram $out/bin/opensearch \ + --prefix PATH : "${lib.makeBinPath [ util-linux gnugrep coreutils ]}" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" + + runHook postInstall + ''; + + passthru.tests = nixosTests.opensearch; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ shyim ]; + }; +} diff --git a/pkgs/servers/search/opensearch/opensearch-home-fix.patch b/pkgs/servers/search/opensearch/opensearch-home-fix.patch new file mode 100644 index 000000000000..25d0130d6d9b --- /dev/null +++ b/pkgs/servers/search/opensearch/opensearch-home-fix.patch @@ -0,0 +1,26 @@ +diff -Naur a/bin/opensearch-env b/bin/opensearch-env +--- a/bin/opensearch-env 2017-12-12 13:31:51.000000000 +0100 ++++ b/bin/opensearch-env 2017-12-18 19:51:12.282809695 +0100 +@@ -19,18 +19,10 @@ + fi + done + +-# determine OpenSearch home; to do this, we strip from the path until we find +-# bin, and then strip bin (there is an assumption here that there is no nested +-# directory under bin also named bin) +-OPENSEARCH_HOME=`dirname "$SCRIPT"` +- +-# now make OPENSEARCH_HOME absolute +-OPENSEARCH_HOME=`cd "$OPENSEARCH_HOME"; pwd` +- +-while [ "`basename "$OPENSEARCH_HOME"`" != "bin" ]; do +- OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` +-done +-OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` ++if [ -z "$OPENSEARCH_HOME" ]; then ++ echo "You must set the OPENSEARCH_HOME var" >&2 ++ exit 1 ++fi + + # now set the classpath + OPENSEARCH_CLASSPATH="$OPENSEARCH_HOME/lib/*" \ No newline at end of file diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index a55967920fe3..915575db65f0 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/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/pkgs/servers/sharing/default.nix b/pkgs/servers/sharing/default.nix new file mode 100644 index 000000000000..dd5df06ad46d --- /dev/null +++ b/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/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index fb34b3c5af40..b43d31a33f22 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/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/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index eb8310397637..89924ffd8343 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.25.0"; + version = "2.26.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ="; + sha256 = "sha256-CNT03pqk0viHymLcmuhb25io9V3cL29y30Bz4TJ9jJY="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index d29453556be2..0ca7e2e76912 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/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/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index b3d898dde651..ee6cb17ff0ff 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-v30F6JhLmPLuYVyegjMPOjUKQ51xxrNfYMqaEPmRuwI="; + hash = "sha256-OH5O0wOg36sAKWr8sFPYU8RX/S9DbbSnGJvQ1v2pXmQ="; }; - vendorHash = "sha256-TMwijafZ5ILTr9ZA5CG5uFFIZe6EmnLAL2zD25l/1gs="; + vendorHash = "sha256-drnVAWMj7x8HlEQXoichgl35qW07tsk3JvXU/d1ukAc="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9eacea78a37e..11ab668d6378 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/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 ]); @@ -241,36 +241,43 @@ in self: { mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.27"; - hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI="; + version = "10.4.28"; + hash = "sha256-AD/SPzxu5RYXbhtisLQ822zdPc1OMPhVwcWrK6r1qGw="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.18"; - hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k="; + version = "10.5.19"; + hash = "sha256-JExKJCSQZBBmI8uEqm3lFN3xeH3oZmQHUoK7qOxXV/Q="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07 - version = "10.6.11"; - hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo="; + version = "10.6.12"; + hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_108 = self.callPackage generic { - # Supported until 2023-05 - version = "10.8.6"; - hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20="; + # Supported until 2023-05. TODO: remove ahead of 23.05 branchoff + version = "10.8.7"; + hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_109 = self.callPackage generic { - # Supported until 2023-08 - version = "10.9.4"; - hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ="; + # Supported until 2023-08. TODO: remove ahead of 23.05 branchoff? + version = "10.9.5"; + hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw="; + inherit (self.darwin) cctools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + }; + mariadb_1010 = self.callPackage generic { + # Supported until 2023-11 + version = "10.10.3"; + hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index a292f691629d..cd91f2ef63d6 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/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/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 758794ba876c..6eca03c19447 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/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/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index f6f40bcd6957..ff277e06805c 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/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/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 93df798c8bcb..c5e08b8279a3 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -207,45 +207,45 @@ let in self: { postgresql_11 = self.callPackage generic { - version = "11.18"; + version = "11.19"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-0k8g78UukYrPvMoh6c6ijg4mO4RqDECPz6w7PEoPdQQ="; + hash = "sha256-ExCeK3HxE5QFwnIB2jczphrOcu4cIo2cnwMg4GruFMI="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.13"; + version = "12.14"; psqlSchema = "12"; - hash = "sha256-tsYjBGr0VI8RqEtAeTTWddEe0HDHk9FbBGg79fMi4C0="; + hash = "sha256-eFYQI304LIQtNW40cTjljAb/6uJA5swLUqxevMMNBD4="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.9"; + version = "13.10"; psqlSchema = "13"; - hash = "sha256-7xlmwKXkn77TNwrSgkkoy2sRZGF67q4WBtooP38zpBU="; + hash = "sha256-W7z1pW2FxE86iwWPtGhi/0nLyRg00H4pXQLm3jwhbfI="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.6"; + version = "14.7"; psqlSchema = "14"; - hash = "sha256-UIhA/BgJ05q3InTV8Tfau5/X+0+TPaQWiu67IAae3yI="; + hash = "sha256-zvYPAJj6gQHBVG9CVORbcir1QxM3lFs3ryBwB2MNszE="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.1"; + version = "15.2"; psqlSchema = "15"; - hash = "sha256-ZP3yPXNK+tDf5Ad9rKlqxR3NaX5ori09TKbEXLFOIa4="; + hash = "sha256-maIXH8PWtbX1a3V6ejy4XVCaOOQnOAXe8jlB7SuEaMc="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index e437de887c78..eaf631b4a8b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.4.2"; + version = "1.5.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM="; + hash = "sha256-EBmydzzT0GB1TaGpnxwj1Cq1vvnDlZ+wqJ5Dc3KDT38="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 1def48d46d97..e8a9a6fc09c1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-pz9eHmd7GC30r0uUObOlrcdkAX4c+szjYAXS1U999CE="; + hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 7c9e8fa69595..8015b3a2c3cb 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/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/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index a2d48d388c2e..3f995c0e62d2 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/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/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index a5c4d7f80cc2..05f8834c9538 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/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/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix new file mode 100644 index 000000000000..713072953be2 --- /dev/null +++ b/pkgs/servers/sql/rqlite/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "rqlite"; + version = "7.6.1"; + + src = fetchFromGitHub { + owner = "rqlite"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WvEnMAz3dKG8xMlQzm7E0TmAgvsrRED50bb4Ved1+4U="; + }; + + vendorSha256 = "sha256-qirt5g7dcjAnceejrBnfhDpA4LSEj7eOuznSlfUBUgo="; + + subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; + + # Leaving other flags from https://github.com/rqlite/rqlite/blob/master/package.sh + # since automatically retriving those is nontrivial and inessential + ldflags = [ + "-s" "-w" + "-X github.com/rqlite/rqlite/cmd.Version=${src.rev}" + ]; + + # Tests are in a different subPackage which fails trying to access the network + doCheck = false; + + meta = with lib; { + description = "The lightweight, distributed relational database built on SQLite"; + homepage = "https://github.com/rqlite/rqlite"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 492f323d3845..0e0c84e97de6 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.14.1"; + version = "2.14.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - sha256 = "1x9l39yf65a8ji8x84h583s82hlj6s99gj0fsm4sh2l4i8yrq2yb"; + sha256 = "sha256-c+bPe1t7Nhpx5fwwpLYtsuzxleLd4b1SwBFBaySmLOg="; }; - cargoSha256 = "sha256-Ox1mHjeBprxmuqPIVxeTXDyFcEuipSJ7UjXZjcLElIs="; + cargoSha256 = "sha256-K+YXl1SFVe6aBt663QXlQFD8jB5pvlLwNqUvUP+5aU8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b936fd316283..75adec85e541 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-hNyEABs/GdfOx6vLTVBgbOzkbFvEDYZ0y1y0a0mIsfA="; + sha256 = "sha256-xTfMq8n9Io99qg/cc7SAWelcxXaWr21IQhsICeDCDNU="; }; - vendorSha256 = "sha256-Jy3kjUA8qLhcw9XLw4Xo1zhD+IWZrDNM79TsbnKpx/g="; + vendorSha256 = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 9025c9151bb7..52c21cb63674 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -2,17 +2,21 @@ , buildGoModule , rustPlatform , fetchFromGitHub +, fetchYarnDeps , makeWrapper , symlinkJoin , CoreFoundation , AppKit , libfido2 +, nodejs , openssl , pkg-config , protobuf , Security , stdenv , xdg-utils +, yarn +, yarn2nix-moretea , nixosTests , withRdpClient ? true @@ -23,13 +27,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-dr+tmWVO7yXRLTvJZoFZzayRWETa8wC/aZ7S/vh8qyk="; + hash = "sha256-jJfOgcwKkNFO/5XHxMoapZxM8Tb0kEgKVA7SrMU7uW4="; }; - version = "11.2.3"; + version = "11.3.4"; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-8NTzX9HeGg9U3bmiZHXHTcKnbJk55YfY2bkjilEyg0g="; + cargoHash = "sha256-TSIwLCY01ygCWT73LR/Ch7NwPQA3a3r0PyL3hUzBNr4="; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -50,19 +54,49 @@ let ''; }; - webassets = fetchFromGitHub { - owner = "gravitational"; - repo = "webassets"; - # Submodule rev from https://github.com/gravitational/teleport/tree/v11.2.3 - rev = "cbddcfda9d5ccba11f02ee61bd305c1f600ee6b0"; - hash = "sha256-XPcQaMyf6kEj5RDRKjNO5b+n1zj/TpBHcDnGhYVUbts="; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-MAGeWzA366yzpjdCY0+X6RV5MKcsHa/xD5CJu6ce1FU="; + }; + + webassets = stdenv.mkDerivation { + pname = "teleport-webassets"; + inherit src version; + + nativeBuildInputs = [ + nodejs + yarn + yarn2nix-moretea.fixup_yarn_lock + ]; + + configurePhase = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = '' + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup_yarn_lock yarn.lock + + yarn install --offline \ + --frozen-lockfile \ + --ignore-engines --ignore-scripts + patchShebangs . + + yarn build-ui-oss + ''; + + installPhase = '' + mkdir -p $out + cp -R webassets/. $out + ''; }; in buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-rWdRVOaPPK2oXK6fXka4FtuxEkaQf4igm7xlg0wauMs="; + vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA="; + proxyVendor = true; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "libfido2" "webassets_embed" ] @@ -85,10 +119,7 @@ buildGoModule rec { outputs = [ "out" "client" ]; preBuild = '' - mkdir -p build - echo "making webassets" - cp -r ${webassets}/* webassets/ - make -j$NIX_BUILD_CORES lib/web/build/webassets + cp -r ${webassets} webassets '' + lib.optionalString withRdpClient '' ln -s ${rdpClient}/lib/* lib/ ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 60eb9a22a829..4bc0a230d3cc 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.6"; + version = "2.9.8"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-T1yJT45bCjGizS6bqkzc6EF9uhJ3dhXsSc5X3di6SJ4="; + sha256 = "sha256-3vrMh0zrJQhIG9VAlG/iHlOVlUFlE4qd0EkOB0ckAtY="; stripRoot = false; }; - vendorSha256 = "sha256-g/UL+cUenWW94afWIGFU2fBSpo48YcUIUaX/1M5vhNk="; + vendorSha256 = "sha256-NyI+3wYRZ3L98qwrkDfrbJK4S+Wdx/UJ8FlLAMhaL7A="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 833d31de4013..325632da48ce 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -78,6 +78,9 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but unrecognized with GCC 9 + "-Wno-error=use-after-free" ]; configureFlags = [ diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index e0ec15eefba8..e96528d7cd6a 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.01"; + version = "23.01.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "0d2hqqa4x133ni8j0dijzn9653iq44ax4rly85g9kiwrjd0l17cw"; + sha256 = "sha256-S4yGys1Lc2FAd3RKI4KdE9X12rsQyVcPQ+Biwwrnb0I="; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index ea413c996fb5..480250900b3c 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/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/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 0f80c3f4276a..35df24afd468 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/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/pkgs/servers/web-apps/outline/yarn.lock b/pkgs/servers/web-apps/outline/yarn.lock index 4cc338dbf6f0..f5b7c69fd4d8 100644 --- a/pkgs/servers/web-apps/outline/yarn.lock +++ b/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/pkgs/servers/web-apps/outline/yarn.nix b/pkgs/servers/web-apps/outline/yarn.nix index 8f4cbb4b8b35..6e2aa068aeab 100644 --- a/pkgs/servers/web-apps/outline/yarn.nix +++ b/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/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix index e7756e4bb3b6..b200ae637f56 100644 --- a/pkgs/servers/web-apps/phylactery/default.nix +++ b/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/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 2b1a6f69b512..9ea17db9ee13 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2022-09-01"; + version = "unstable-2023-03-13"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "174e5242569812618af4ebd9a646ba2a6ded5459"; - sha256 = "sha256-Q1+4HkgOoTRtW5XYWpC5dpukkrjG5fP0585soo/srmQ="; + rev = "295c87a926c3deb1e438234550a9d8fbbaad17fa"; + sha256 = "sha256-ItPFUyyuctx/yyMVUn5Ez9f+taNiV6FR0q9wz1jwk8M="; }; postPatch = '' @@ -26,11 +26,11 @@ python3.pkgs.buildPythonApplication rec { babel certifi python-dateutil + fasttext-predict flask flask-babel brotli jinja2 - langdetect lxml pygments pyyaml @@ -56,6 +56,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index a9a81119fc1c..1e6763c39c3e 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/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,11 +27,19 @@ 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 = [ ./wallabag-data.patch # exposes $WALLABAG_DATA + + # Use sendmail from php.ini instead of FHS path. + (fetchpatch { + url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch"; + stripLen = 1; + extraPrefix = "vendor/symfony/swiftmailer-bundle/"; + sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho="; + }) ]; dontBuild = true; diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 6df706e22b79..17714ada38cc 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/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/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 19d23531f6b0..a60c06854183 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -5,4 +5,10 @@ url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip"; hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; }; + themes.geist = fetchzip rec { + name = "geist"; + version = "2.0.3"; + url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; + hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0907d814171f..e46d8e750a03 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -22,18 +22,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { pname = "bdftopcf"; - version = "1.1"; + version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; - sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; + url = "https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz"; + sha256 = "026rzs92h9jsc7r0kvvyvwhm22q0805gp38rs14x6ghg7kam7j8i"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; + buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; @@ -178,11 +178,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-alias"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; - sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; + url = "mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2"; + sha256 = "0xjjjindczv3g7m1597l0x19zz75xy70wh5garghz61fpzl1l4gk"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -890,18 +890,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans }: stdenv.mkDerivation { pname = "libX11"; - version = "1.8.1"; + version = "1.8.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.1.tar.xz"; - sha256 = "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v"; + url = "mirror://xorg/individual/lib/libX11-1.8.3.tar.xz"; + sha256 = "1gc5cnfys48m1y9y1cidph89fww5c209qff93phbidh68346a5g3"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libxcb xtrans ]; + buildInputs = [ xorgproto libpthreadstubs libxcb xtrans ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1516,11 +1516,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { pname = "lndir"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; - sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; + url = "mirror://xorg/individual/util/lndir-1.0.4.tar.xz"; + sha256 = "11syg5hx3f7m1d2p7zw717lryk819h6wk8h4vmapfdxvsflkfd1y"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3436,11 +3436,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { pname = "xset"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; - sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; + url = "mirror://xorg/individual/app/xset-1.2.5.tar.xz"; + sha256 = "0bsyyx3k32k9vpb8x3ks7hlfr03nm0i14fv3cg6n4f2vcdajsscz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b0530977f7e2..d0a2ec881219 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -184,6 +184,7 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; + outputDoc = "devdoc"; outputs = [ "out" "dev" "devdoc" ]; }); @@ -591,6 +592,7 @@ self: super: xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker + NIX_CFLAGS_COMPILE = [ "-Wno-error=address" ]; # gcc12 meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; @@ -861,6 +863,11 @@ self: super: url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/ccdd431cd8f1cabae9d744f0514b6533c438908c.diff"; sha256 = "sha256-IGPsjS7KgRPLrs1ImBXvIFCa8Iu5ZiAHRZvHlBYP8KQ="; }) + (fetchpatch { + name = "CVE-2023-0494.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ba6d8c37071131a49790243cdac55392ecf71ec.diff"; + sha256 = "sha256-/+IuGk09OYVEIB/Y+DTKf7kfHyukEFX/6u1FDIGJieY="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ @@ -886,6 +893,11 @@ self: super: "--disable-tls" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9a82416d3050..dd09fbba34f5 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -8,7 +8,7 @@ https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 +https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2 @@ -64,7 +64,7 @@ mirror://xorg/individual/app/xprop-1.2.6.tar.xz mirror://xorg/individual/app/xrandr-1.5.1.tar.xz mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 -mirror://xorg/individual/app/xset-1.2.4.tar.bz2 +mirror://xorg/individual/app/xset-1.2.5.tar.xz mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 @@ -135,7 +135,7 @@ mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2 mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2 @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.1.tar.xz +mirror://xorg/individual/lib/libX11-1.8.3.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libxcb-1.14.tar.xz @@ -213,7 +213,7 @@ mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ae3025461449..c76295cec83f 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/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 = [ @@ -95,11 +95,12 @@ stdenv.mkDerivation rec { zlib ]; mesonFlags = [ - "-Dxwayland_eglstream=true" - "-Ddefault_font_path=${defaultFontPath}" - "-Dxkb_bin_dir=${xkbcomp}/bin" - "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" - "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" + (lib.mesonBool "xwayland_eglstream" true) + (lib.mesonOption "default_font_path" defaultFontPath) + (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") + (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb") + (lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled") + (lib.mesonBool "libunwind" (libunwind != null)) ]; meta = with lib; { diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index b05b96378418..e24397773d51 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/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/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 7735243d3bab..932e81a5177e 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -12,6 +12,8 @@ , withDocs ? false , texinfo , forFHSEnv ? false + +, pkgsStatic }: let @@ -37,6 +39,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" "info" ]; + separateDebugInfo = true; + NIX_CFLAGS_COMPILE = '' -DSYS_BASHRC="/etc/bashrc" -DSYS_BASH_LOGOUT="/etc/bash_logout" @@ -50,13 +54,14 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - patches = upstreamPatches - ++ [ ./pgrp-pipe-5.patch ] - ++ lib.optional stdenv.hostPlatform.isStatic (fetchurl { + patches = upstreamPatches ++ [ + ./pgrp-pipe-5.patch + (fetchurl { name = "fix-static.patch"; url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; - }); + }) + ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -113,6 +118,7 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/bash"; + tests.static = pkgsStatic.bash; }; meta = with lib; { diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index c1980309e1f1..20e1331dbcb9 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "hilbish"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-5GPJVusF3/WbEE5VH45Wyxq40wbNxgjO8QI2cLMpdN0="; + sha256 = "sha256-iXDBo3bcmjsDy+iUREpg+sDTFN2LeF7jA+mg62LKeIs="; fetchSubmodules = true; }; subPackages = [ "." ]; - vendorSha256 = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo="; + vendorHash = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo="; ldflags = [ "-s" diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix new file mode 100644 index 000000000000..e957fdba7525 --- /dev/null +++ b/pkgs/shells/nix-your-shell/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: +rustPlatform.buildRustPackage rec { + pname = "nix-your-shell"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-MXshCRgGL2V51Pd1ms6D0Sn0mtRcxd0pWUz+zghBTdI="; + }; + + cargoSha256 = "sha256-f1igCSdv6iMUDeCDGSxDIecjVcJQN2jbdALGMpDVepQ="; + + meta = with lib; { + description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; + homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; + license = [ licenses.mit ]; + maintainers = [ maintainers._9999years ]; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 68b2f95a4034..a5f9ae2f94e5 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -11,11 +11,9 @@ , python3 , xorg , libiconv +, Libsystem , AppKit -, Foundation , Security -# darwin.apple_sdk.sdk -, sdk , nghttp2 , libgit2 , withExtraFeatures ? true @@ -26,16 +24,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 ]; @@ -45,22 +43,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - Foundation - ( - # Pull a header that contains a definition of proc_pid_rusage(). - # (We pick just that one because using the other headers from `sdk` is not - # compatible with our C++ standard library. This header is already in - # the standard library on aarch64) - # See also: - # https://github.com/shanesveller/nixpkgs/tree/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/development/libraries/webkitgtk/default.nix - # https://github.com/shanesveller/nixpkgs/blob/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/tools/system/btop/default.nix#L32-L38 - runCommand "${pname}_headers" { } '' - install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h - '' - ) - ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ] + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; buildFeatures = lib.optional withExtraFeatures "extra"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ce9ddb4ed607..29416b6357ed 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/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-02-02"; + version = "2023-02-16"; pname = "oh-my-zsh"; - rev = "f8bf8f0029a475831ebfba0799975ede20e08742"; + rev = "8a68bf67720a6a5442ae947d10d74b1dd3558d91"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "5xS5SPNnQTde/2UbOBmjKHiq+nr2Wgj4mt7cNa5m7fs="; + sha256 = "n6gfuvzz62l9AvQqWOwNjecLnHj4tsa5FDpunUeHZ/k="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f78723ee6e2b..02f1f6513c56 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/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/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index ff1a5f7d9c75..0bfbd9cd4b73 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/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/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 2ee8c070ae19..6cc6271eedbe 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/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" @@ -737,6 +736,7 @@ rec { pcre.out gettext binutils.bintools + binutils.bintools.lib darwin.binutils darwin.binutils.bintools curl.out diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 751e19d1681a..4b0ca649ee94 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -242,7 +242,7 @@ let remediationMsg = (builtins.getAttr reason remediation) attrs; msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}" else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway." - + (if remediationMsg != "" then "\n${remediationMsg}" else ""); + + (lib.optionalString (remediationMsg != "") "\n${remediationMsg}"); isEnabled = lib.findFirst (x: x == reason) null showWarnings; in if isEnabled != null then builtins.trace msg true else true; @@ -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; @@ -321,7 +322,7 @@ let }" else "key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + checkMeta = meta: lib.optionals config.checkMeta (lib.remove null (lib.mapAttrsToList checkMetaAttr meta)); checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 517cfc03aea5..3d60934557c6 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -173,6 +173,13 @@ let separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; + # Turn a derivation into its outPath without a string context attached. + # See the comment at the usage site. + unsafeDerivationToUntrackedOutpath = drv: + if lib.isDerivation drv + then builtins.unsafeDiscardStringContext drv.outPath + else drv; + noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs @@ -392,10 +399,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] @@ -446,6 +451,40 @@ else let "/bin/sh" ]; __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; + } // + # If we use derivations directly here, they end up as build-time dependencies. + # This is especially problematic in the case of disallowed*, since the disallowed + # derivations will be built by nix as build-time dependencies, while those + # derivations might take a very long time to build, or might not even build + # successfully on the platform used. + # We can improve on this situation by instead passing only the outPath, + # without an attached string context, to nix. The out path will be a placeholder + # which will be replaced by the actual out path if the derivation in question + # is part of the final closure (and thus needs to be built). If it is not + # part of the final closure, then the placeholder will be passed along, + # but in that case we know for a fact that the derivation is not part of the closure. + # This means that passing the out path to nix does the right thing in either + # case, both for disallowed and allowed references/requisites, and we won't + # build the derivation if it wouldn't be part of the closure, saving time and resources. + # While the problem is less severe for allowed*, since we want the derivation + # to be built eventually, we would still like to get the error early and without + # having to wait while nix builds a derivation that might not be used. + # See also https://github.com/NixOS/nix/issues/4629 + lib.optionalAttrs (attrs ? disallowedReferences) { + disallowedReferences = + map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; + } // + lib.optionalAttrs (attrs ? disallowedRequisites) { + disallowedRequisites = + map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; + } // + lib.optionalAttrs (attrs ? allowedReferences) { + allowedReferences = + lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + } // + lib.optionalAttrs (attrs ? allowedRequisites) { + allowedRequisites = + lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; validity = checkMeta { inherit meta attrs; }; @@ -530,6 +569,12 @@ lib.extendDerivation # them as runtime dependencies (since Nix greps for store paths # through $out to find them) args = [ "-c" "export > $out" ]; + + # inputDerivation produces the inputs; not the outputs, so any + # restrictions on what used to be the outputs don't serve a purpose + # anymore. + disallowedReferences = [ ]; + disallowedRequisites = [ ]; }); inherit meta passthru overrideAttrs; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b1b982ecdffc..cbf2a2ceb8de 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -992,13 +992,22 @@ stripHash() { unpackCmdHooks+=(_defaultUnpack) _defaultUnpack() { local fn="$1" + local destination if [ -d "$fn" ]; then + destination="$(stripHash "$fn")" + + if [ -e "$destination" ]; then + echo "Cannot copy $fn to $destination: destination already exists!" + echo "Did you specify two \"srcs\" with the same \"name\"?" + return 1 + fi + # We can't preserve hardlinks because they may have been # introduced by store optimization, which might break things # in the build. - cp -pr --reflink=auto -- "$fn" "$(stripHash "$fn")" + cp -pr --reflink=auto -- "$fn" "$destination" else diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5c7dfcceec64..878190738286 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -104,8 +104,8 @@ let '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" - ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} - ${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} + ${lib.optionalString (system == "x86_64-linux") "NIX_LIB64_IN_SELF_RPATH=1"} + ${lib.optionalString (system == "mipsel-linux") "NIX_LIB32_IN_SELF_RPATH=1"} ''; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 87862b84bc1b..bae4ff2c93b2 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -12,9 +12,9 @@ let else "/bin/bash"; path = - (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ - (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ - (if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++ + (lib.optionals (system == "i686-solaris") [ "/usr/gnu" ]) ++ + (lib.optionals (system == "i686-netbsd") [ "/usr/pkg" ]) ++ + (lib.optionals (system == "x86_64-solaris") [ "/opt/local/gnu" ]) ++ ["/" "/usr" "/usr/local"]; prehookBase = '' diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 7f25d7dbd2db..3d72efae6c47 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -23,19 +23,29 @@ }; make-symlinks-relative = stdenv.mkDerivation { name = "test-make-symlinks-relative"; + outputs = [ "out" "man" ]; buildCommand = '' mkdir -p $out/{bar,baz} + mkdir -p $man/share/{x,y} source1="$out/bar/foo" destination1="$out/baz/foo" + source2="$man/share/x/file1" + destination2="$man/share/y/file2" echo foo > $source1 + echo foo > $source2 ln -s $source1 $destination1 + ln -s $source2 $destination2 echo "symlink before patching: $(readlink $destination1)" + echo "symlink before patching: $(readlink $destination2)" - _makeSymlinksRelative + _makeSymlinksRelativeInAllOutputs echo "symlink after patching: $(readlink $destination1)" ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) + echo "symlink after patching: $(readlink $destination2)" + ([[ -e $destination2 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) + ([[ $(readlink $destination2) == "../x/file1" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) ''; }; move-docs = stdenv.mkDerivation { diff --git a/pkgs/tools/X11/paperview/default.nix b/pkgs/tools/X11/paperview/default.nix new file mode 100644 index 000000000000..790eaed53ab5 --- /dev/null +++ b/pkgs/tools/X11/paperview/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "paperview"; + version = "unstable-2020-09-22"; + + src = fetchFromGitHub { + owner = "glouw"; + repo = "paperview"; + rev = "40162fb76566fec8163c338c169c2fcd9df6ef42"; + hash = "sha256-rvf89vMIT274+Hva+N4KFu1iT2XE6fq5Bi4kOQg2M0g="; + }; + + buildInputs = [ + SDL2 + libX11 + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A high performance X11 animated wallpaper setter"; + homepage = "https://github.com/glouw/paperview"; + platforms = platforms.linux; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + }; +} diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/tools/X11/sunpaper/default.nix index 419aa046909f..9f760bb4a93f 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/tools/X11/sunpaper/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "sunpaper"; - version = "unstable-2022-04-01"; + version = "2.0"; src = fetchFromGitHub { owner = "hexive"; repo = "sunpaper"; - rev = "8d518dfddb5e80215ef3b884ff009df1d4bb74c2"; - sha256 = "sCG7igD2ZwfHoRpR3Kw7dAded4hG2RbMLR/9nH+nZh8="; + rev = "v${version}"; + sha256 = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM="; }; buildInputs = [ diff --git a/pkgs/tools/X11/xosview/default.nix b/pkgs/tools/X11/xosview/default.nix index ca8eac38aa21..3b09b150a0fc 100644 --- a/pkgs/tools/X11/xosview/default.nix +++ b/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/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 8bee8a2e7a53..f0aa3edd8a69 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-yX95qmcyouSSjEHorMpRJjZyrxIjQorwTpGtGZN4s6s="; + sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw="; }; - cargoSha256 = "sha256-DweJ608aJChn2ezAM7Ly0cwtLAvM1DZ5gc4WUVyKIco="; + cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk="; 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/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 6eb84855247d..b64980a1b546 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/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.10.0"; # 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-W05ZxpqamYqtFY/2mV2+XODCeuWRE9KhMdMkaAGAiTU="; }; nativeBuildInputs = [ @@ -64,10 +64,7 @@ with py.pkgs; buildPythonApplication rec { ]; postPatch = '' - sed -i pyproject.toml \ - -e 's/colorama.*/colorama",/' \ - -e 's/cryptography.*/cryptography",/' \ - -e 's/distro.*/distro",/' + substituteInPlace pyproject.toml --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" ''; postInstall = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index e3b2ae74ca4b..433b4240640d 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.127.0"; + version = "0.129.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M="; + sha256 = "sha256-p9haEozDc1ZTGar89Clm7eEFFLJCYcw+gBN40Zg5vi8="; }; - vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0="; + vendorHash = "sha256-Vb0sgOOIQI0rTJDITFoMbXJcnN7BondbFTm3AF1JTLo="; doCheck = false; diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 72d293de211a..e43e945455a4 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -100,9 +100,7 @@ let pname = component.id; version = component.version.version_string; src = - if lib.hasAttrByPath [ "data" "source" ] component - then "${baseUrl}/${component.data.source}" - else ""; + lib.optionalString (lib.hasAttrByPath [ "data" "source" ] component) "${baseUrl}/${component.data.source}"; sha256 = lib.attrByPath [ "data" "checksum" ] "" component; dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies; platforms = @@ -137,12 +135,12 @@ let }: stdenv.mkDerivation { inherit pname version snapshot; src = - if src != "" then - builtins.fetchurl + lib.optionalString (src != "") + (builtins.fetchurl { url = src; inherit sha256; - } else ""; + }) ; dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 88621f236569..1471f039d395 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/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/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 9d7c35a73bea..aab033b0ee28 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; + sha256 = "sha256-FT1cXnMyMrEpZpTMp+kE8ueHReAYf2XQZ/9Nw53TYbg="; }; - vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; + vendorSha256 = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index a0db37fba54c..9f164d86140c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.10"; + version = "5.11"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU="; + hash = "sha256-6z6C1nWmnHLdLtLf7l1f4riGhuP2J2mt8mVWZIiege0="; }; vendorSha256 = null; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bf1ad3cfe47b..c1753fe1a563 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/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/pkgs/tools/admin/pgadmin/check-system-config-dir.patch b/pkgs/tools/admin/pgadmin/check-system-config-dir.patch new file mode 100644 index 000000000000..f614bab64e6f --- /dev/null +++ b/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/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index b88307101017..a83d96779de6 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -7,15 +7,18 @@ , 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 { @@ -26,51 +29,6 @@ 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 @@ -104,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 { @@ -131,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 = '' @@ -146,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 = '' @@ -197,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/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index cd30686bf065..462d82e2134d 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/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/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 463e68254ff5..df20a984a8f7 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/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/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index 0b9a47865743..d4c5e2c7b1ce 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/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/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index c27cbcb35dc0..72767fb84c53 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/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/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0e8fc3292589..68a0936c7eba 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.53.1"; + version = "3.55.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; + sdkVendorHash = "sha256-ZE+df01jRx3nDiPGdlh1JNJn5NqsHW22fiUzeNlkzF8="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-5+NwhrALKqyaX6uj1d3Dp3CXWif5/mkL1QgT4pN29bw="; + hash = "sha256-x5XebYFpxFi2QgrrK+wdMFOLiJLnRmar4gsply8F718="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorSha256 = "sha256-GoRPXbgQqix8FQxQx5oxzeV3+Rfzc02GniGnJS5HJWE="; + vendorSha256 = "sha256-8vchyD3MTi9Fxrd6SiywFK4tadyauvDxjs9RmoJuULA="; sourceRoot = "${src.name}/pkg"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 84c894a57fcf..3b35207e8499 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.6"; + version = "0.49.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI="; + hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0="; }; - vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw="; + vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index e7d13b20b60a..2d7f00d2d649 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.69.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-nwS5Oar8ck9StNJtbnZoRv3/v/fYKq/RXVl7CPWBfGY="; + hash = "sha256-Q02WBUMwboGkXrSjCT2C3vLYH4UlnavIudvOSb5g2bA="; # 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-bUSQk4uJ4TAhjLS8pjqC486sa31z/MyZf5jDsnxhtSM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index e4933986176e..2c282514d330 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-77X+AvHFWfYYIio3c+EYf11jg/1IbYhNUweRIDHMOZw="; }; - patches = [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/TigerVNC/tigervnc/pull/1383.patch"; @@ -65,6 +64,10 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=array-bounds" + ]; + postBuild = lib.optionalString stdenv.isLinux '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index e68b565d0581..ca0f9a961a15 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4kjsNaiXnmJk88ivVnpTemOOc/asKrcZLGpO8gtV0J8="; + sha256 = "sha256-k5S0ttOhI+vjiGJpIPVi9ro6n3f2Cxe7HiADvs14Zuo="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-qI29Qb8im9Xii83ayG1jZtZsrsAT0JQOcuKOM7VYro0="; + vendorSha256 = "sha256-EJw5DxiBF+gw5X+vqrnZsNCm2umOHEq6GeQ5V/Z0DrE="; excludedPackages = "misc"; diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/tools/admin/uacme/default.nix index fabc4923dd74..039c817bdf20 100644 --- a/pkgs/tools/admin/uacme/default.nix +++ b/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/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 561567f8b154..2ade0f88a8d0 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -13,11 +13,11 @@ 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 + sed '1i#include ' -i src/dec/eagls/pak_archive_decoder.cc # gcc12 ''; checkPhase = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index ab91cfc64834..82329537251e 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "INSTALL=cp" ]; - patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec ++ lib.optional stdenv.isCygwin libiconv; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 4eafd324deb7..a83c1c81c416 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.01.21"; + version = "2023.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-BantnVvIGJ3BKAKjK/6JQS1Kk1E8PDJFP/WuOjYbSy8="; + hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g="; }; meta = with lib; { diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9318b22aaf8c..53261bc6b56f 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/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/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 35685fd5fb2f..0c051047c0fc 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -53,14 +53,17 @@ stdenv.mkDerivation rec { "-Dversion=${version}" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=address" + ] ++ lib.optionals stdenv.isDarwin [ "-Wno-sometimes-uninitialized" "-Wno-tautological-pointer-compare" ] ++ lib.optionals stdenv.isLinux [ "-Wno-array-bounds" "-Wno-free-nonheap-object" "-Wno-stringop-truncation" - ]); + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index b59016e2c9f1..a55c83028151 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/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/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 419ddced72b9..11498e6c75ee 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/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/pkgs/tools/audio/soco-cli/default.nix b/pkgs/tools/audio/soco-cli/default.nix index 72e5323f60f3..068f916e4ef0 100644 --- a/pkgs/tools/audio/soco-cli/default.nix +++ b/pkgs/tools/audio/soco-cli/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "soco-cli"; - version = "0.4.21"; + version = "0.4.55"; format = "setuptools"; disabled = python3.pythonOlder "3.6"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "avantrec"; repo = pname; rev = "v${version}"; - sha256 = "1kz2zx59gjfs01jiyzmps8j6yca06yqn6wkidvdk4s3izdm0rarw"; + sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index d943e43b76b9..d3c10804dedd 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -33,29 +33,16 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.10.2"; + version = "0.11.1"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-IcuRhsURgEYIuS7ldZtxAy4Z/XNDehTGsOfYW+DhScg="; + hash = "sha256-EVFFETiGbrouUsrIhMFZEex3UGCCWTI3CC4yFAcERyw="; }; - patches = [ - # Use packaging.version for version comparisons - (fetchpatch { - url = "https://github.com/coqui-ai/TTS/commit/77a9ef8ac97ea1b0f7f8d8287dba69a74fdf22ce.patch"; - hash = "sha256-zWJmINyxw2efhR9KIVkDPHao5703zlpCKwdzOh/1APY="; - }) - # Fix espeak version detection logic - (fetchpatch { - url = "https://github.com/coqui-ai/TTS/commit/0031df0143b069d7db59ba04d1adfafcc1a92f47.patch"; - hash = "sha256-6cL9YqWrB+0QomINpA9BxdYmEDpXF03udGEchydQmBA="; - }) - ]; - postPatch = let relaxedConstraints = [ "cython" @@ -149,6 +136,7 @@ python.pkgs.buildPythonApplication rec { "test_models_offset_2_step_3" "test_run_all_models" "test_synthesize" + "test_voice_cloning" "test_voice_conversion" "test_multi_speaker_multi_lingual_model" "test_single_speaker_model" @@ -166,9 +154,12 @@ python.pkgs.buildPythonApplication rec { "tests/tts_tests/test_align_tts_train.py" "tests/tts_tests/test_fast_pitch_speaker_emb_train.py" "tests/tts_tests/test_fast_pitch_train.py" + "tests/tts_tests/test_fastspeech_2_speaker_emb_train.py" + "tests/tts_tests/test_fastspeech_2_train.py" "tests/tts_tests/test_glow_tts_d-vectors_train.py" "tests/tts_tests/test_glow_tts_speaker_emb_train.py" "tests/tts_tests/test_glow_tts_train.py" + "tests/tts_tests/test_neuralhmm_tts_train.py" "tests/tts_tests/test_overflow_train.py" "tests/tts_tests/test_speedy_speech_train.py" "tests/tts_tests/test_tacotron2_d-vectors_train.py" diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 60af9b430a94..9de97fe52f48 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/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/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index dc77b5de403f..dcc4caaa6362 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/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/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index b5a694482cb8..dfde510441c0 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.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/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 2d764d2f7da0..612f4ebf04d8 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY="; }; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-std=c++11" ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ]; propagatedBuildInputs = [ tesseract ]; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index dfac5af0980b..3d15cbd395c4 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,18 +4,19 @@ , cmake , fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic +, testers }: # ?TODO: there's also python lib in there -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brotli"; version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { cp ../docs/*.3 $out/share/man/man3/ ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; @@ -72,6 +75,10 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + pkgConfigModules = [ + "libbrotlidec" + "libbrotlienc" + ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix index ca5670a2e512..e9d6f7c44dab 100644 --- a/pkgs/tools/compression/bzip2/1_1.nix +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -3,9 +3,10 @@ , meson , python3 , ninja +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip2-unstable"; version = "2020-08-11"; @@ -34,10 +35,13 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bz2" ]; platforms = platforms.all; maintainers = []; }; -} +}) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3b48195d11d6..be456cf59442 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/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/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 55ef5309d57d..37a4519c9454 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; version = "1.2.2"; @@ -14,12 +15,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kspalaiologos"; repo = "bzip3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-B59Z7+5SFjt/UgppNtdUtzw96y+EVglHoKzq9Il9ud8="; }; postPatch = '' - echo -n "${version}" > .tarball-version + echo -n "${finalAttrs.version}" > .tarball-version patchShebangs build-aux # build-aux/ax_subst_man_date.m4 calls git if the file exists @@ -35,12 +36,15 @@ stdenv.mkDerivation rec { "--disable-arch-native" ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "A better and stronger spiritual successor to BZip2"; homepage = "https://github.com/kspalaiologos/bzip3"; - changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS"; + changelog = "https://github.com/kspalaiologos/bzip3/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "bzip3" ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c556f31e6918..d176b32d60cf 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,39 +1,17 @@ -{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "upx"; - version = "3.96"; - src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz"; - sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"; + version = "4.0.2"; + src = fetchFromGitHub { + owner = "upx"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-5jqEdMlHmsD88kT/EGieL7DktppVdfWyJWGRNRKbRc4="; }; - buildInputs = [ ucl zlib perl ]; - - patches = [ - (fetchpatch { - url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch"; - sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M="; - name = "CVE-2021-20285.patch"; - }) - ]; - - preConfigure = '' - export UPX_UCLDIR=${ucl} - ''; - - makeFlags = [ - "-C" "src" - "CHECK_WHITESPACE=true" - - # Disable blanket -Werror. Triggers failues on minor gcc-11 warnings. - "CXXFLAGS_WERROR=" - ]; - - installPhase = '' - mkdir -p $out/bin - cp src/upx.out $out/bin/upx - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { homepage = "https://upx.github.io/"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 6a489779cb02..40df92b4d538 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -8,6 +8,15 @@ , buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform , doCheck ? stdenv.hostPlatform == stdenv.buildPlatform , nix-update-script + +# for passthru.tests +, libarchive +, rocksdb +, arrow-cpp +, libzip +, curl +, python3Packages +, haskellPackages }: stdenv.mkDerivation rec { @@ -91,6 +100,14 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { + inherit libarchive rocksdb arrow-cpp; + libzip = libzip.override { withZstd = true; }; + curl = curl.override { zstdSupport = true; }; + python-zstd = python3Packages.zstd; + haskell-zstd = haskellPackages.zstd; + haskell-hs-zstd = haskellPackages.hs-zstd; + }; }; meta = with lib; { diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index a620a07d4753..b9bed9cc20c0 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -24,7 +24,11 @@ in stdenv.mkDerivation rec { pname = "blobfuse"; inherit version src; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=catch-value" + ]; buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index d9ec176220ba..e2677957e9cd 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchurl +{ lib, stdenv, runCommand, fetchurl, fetchpatch , ensureNewerSourcesHook , cmake, pkg-config , which, git @@ -152,6 +152,21 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + # pacific: include/buffer: include + # fixes build with gcc 12 + # https://github.com/ceph/ceph/pull/47295 + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/df88789a38c053513d3b2a9b7d12a952fc0c9042.patch"; + hash = "sha256-je65kBfa5hR0ZKo6ZI10XmD5ZUbKj5rxlGxxI9ZJVfo="; + }) + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/2abcbe4e47705e6e0fcc7d9d9b75625f563199af.patch"; + hash = "sha256-8sWQKoZNHuGuhzX/F+3fY4+kjsrwsfoMdVpfVSj2x5w="; + }) + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/13dc077cf6c65a3b8c4f13d896847b9964b3fcbb.patch"; + hash = "sha256-byfiZh9OJrux/y5m3QCPg0LET6q33ZDXmp/CN+yOSQQ="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index e7eecbf766ee..9c38852e4e90 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/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/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index e8ea32984965..e1edac0c6104 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.20.3"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-8ssYzsjXwYH3xVFxtk8zYcJnrc+wKuoV1js0ONRKBGQ="; + sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8="; }; - cargoHash = "sha256-eg5EXvpwIlza7mXc5MFTpaFLQSR2z/7GSPGyBgzzOj4="; + cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 39052ecba935..34a32c4a6dfe 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-std=c++14" + ]; + installPhase = '' mkdir -p $out/bin cp iDSK $out/bin diff --git a/pkgs/tools/filesystems/kio-admin/default.nix b/pkgs/tools/filesystems/kio-admin/default.nix new file mode 100644 index 000000000000..7e4a97fa255a --- /dev/null +++ b/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/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 898ba9ed3c15..55b796ec3254 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/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/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix index 78bc6bd55c46..ace05d061665 100644 --- a/pkgs/tools/filesystems/rmfuse/default.nix +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -1,44 +1,49 @@ -{ poetry2nix, pkgs, lib }: +{ lib +, python3 +, fetchFromGitHub +}: -let - pythonPackages = (poetry2nix.mkPoetryPackages { - projectDir = ./.; - overrides = [ - poetry2nix.defaultPoetryOverrides - (import ./poetry-git-overlay.nix { inherit pkgs; }) - (self: super: { +python3.pkgs.buildPythonApplication rec { + pname = "rmfuse"; + version = "unstable-2021-06-06"; - rmfuse = super.rmfuse.overridePythonAttrs(old: { - meta = old.meta // { - description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; - longDescription = '' - RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. - ''; - license = lib.licenses.mit; - homepage = "https://github.com/rschroll/rmfuse"; - maintainers = [ lib.maintainers.adisbladis ]; - }; - }); + format = "pyproject"; - reportlab = let - ft = pkgs.freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); - in super.reportlab.overridePythonAttrs(old: { - postPatch = '' - substituteInPlace setup.py \ - --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" - ''; + src = fetchFromGitHub { + owner = "rschroll"; + repo = "rmfuse"; + rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; + hash = "sha256-W3kS6Kkmp8iWMOYFL7r1GyjSQvFotBXQCuTMK0vyHQ8="; + }; - NIX_CFLAGS_COMPILE = "-I${pkgs.freetype}/include/freetype2"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'bidict = "^' 'bidict = ">=' + ''; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkg-config - ]; - buildInputs = old.buildInputs ++ [ - pkgs.freetype - ]; - }); + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; - }) - ]; - }).python.pkgs; -in pythonPackages.rmfuse + propagatedBuildInputs = with python3.pkgs; [ + bidict + rmrl + rmcl + pyfuse3 + xdg + ]; + + meta = { + description = "FUSE access to the reMarkable Cloud"; + homepage = "https://github.com/rschroll/rmfuse"; + license = lib.licenses.mit; + longDescription = '' + RMfuse provides access to your reMarkable Cloud files in the form of a + FUSE filesystem. These files are exposed either in their original format, + or as PDF files that contain your annotations. This lets you manage files + in the reMarkable Cloud using the same tools you use on your local + system. + ''; + maintainers = with lib.maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix deleted file mode 100644 index 2ee4f805fb2d..000000000000 --- a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs }: -self: super: { - - rmfuse = super.rmfuse.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/rschroll/rmfuse.git"; - rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; - sha256 = "03qxy95jpk741b81bd38y51d4a0vynx2y1g662bci9r6m7l14yav"; - }; - } - ); - -} diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock deleted file mode 100644 index 4c588fc99e9f..000000000000 --- a/pkgs/tools/filesystems/rmfuse/poetry.lock +++ /dev/null @@ -1,596 +0,0 @@ -[[package]] -name = "anyio" -version = "2.2.0" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" - -[package.extras] -curio = ["curio (>=1.4)"] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asks" -version = "2.4.12" -description = "asks - async http" -category = "main" -optional = false -python-versions = ">= 3.6.2" - -[package.dependencies] -anyio = ">=2.0,<3.0" -async_generator = "*" -h11 = "*" - -[[package]] -name = "async-generator" -version = "1.10" -description = "Async generators and context managers for Python 3.5+" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "attrs" -version = "21.4.0" -description = "Classes Without Boilerplate" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] -docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] - -[[package]] -name = "bidict" -version = "0.21.4" -description = "The bidirectional mapping library for Python." -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "cffi" -version = "1.15.0" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "cssselect2" -version = "0.6.0" -description = "CSS selectors for Python ElementTree" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -tinycss2 = "*" -webencodings = "*" - -[package.extras] -doc = ["sphinx", "sphinx-rtd-theme"] -test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] - -[[package]] -name = "h11" -version = "0.13.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "lxml" -version = "4.9.0" -description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" - -[package.extras] -cssselect = ["cssselect (>=0.7)"] -html5 = ["html5lib"] -htmlsoup = ["beautifulsoup4"] -source = ["Cython (>=0.29.7)"] - -[[package]] -name = "outcome" -version = "1.1.0" -description = "Capture the outcome of Python function calls." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -attrs = ">=19.2.0" - -[[package]] -name = "pdfrw" -version = "0.4" -description = "PDF file reader/writer library" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pillow" -version = "9.1.1" -description = "Python Imaging Library (Fork)" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-issues (>=3.0.1)", "sphinx-removed-in", "sphinx-rtd-theme (>=1.0)", "sphinxext-opengraph"] -tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "pyfuse3" -version = "3.2.1" -description = "Python 3 bindings for libfuse 3 with async I/O support" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -trio = ">=0.15" - -[[package]] -name = "reportlab" -version = "3.6.9" -description = "The Reportlab Toolkit" -category = "main" -optional = false -python-versions = ">=3.7, <4" - -[package.dependencies] -pillow = ">=4.0.0" - -[package.extras] -rlpycairo = ["rlPyCairo (>=0.0.5)"] - -[[package]] -name = "rmcl" -version = "0.4.2" -description = "reMarkable Cloud Library" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -asks = ">=2.4.12,<3.0.0" -trio = ">=0.18.0,<0.19.0" -xdg = ">=5.0.1,<6.0.0" - -[[package]] -name = "rmfuse" -version = "0.2.3" -description = "" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -bidict = "^0.21.2" -pyfuse3 = {version = "^3.2.0", optional = true} -rmcl = "^0.4.2" -rmrl = "^0.2.1" -xdg = "^5.0.1" - -[package.extras] -pyfuse3 = ["pyfuse3 (>=3.2.0,<4.0.0)"] -llfuse = ["llfuse (>=1.4.1,<2.0.0)"] - -[package.source] -type = "git" -url = "https://github.com/rschroll/rmfuse.git" -reference = "master" -resolved_reference = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2" - -[[package]] -name = "rmrl" -version = "0.2.1" -description = "Render reMarkable documents to PDF" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -pdfrw = ">=0.4,<0.5" -reportlab = ">=3.5.59,<4.0.0" -svglib = ">=1.0.1,<2.0.0" -xdg = ">=5.0.1,<6.0.0" - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "sortedcontainers" -version = "2.4.0" -description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "svglib" -version = "1.3.0" -description = "A pure-Python library for reading and converting SVG" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -cssselect2 = ">=0.2.0" -lxml = "*" -reportlab = "*" -tinycss2 = ">=0.6.0" - -[[package]] -name = "tinycss2" -version = "1.1.1" -description = "A tiny CSS parser" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -webencodings = ">=0.4" - -[package.extras] -doc = ["sphinx", "sphinx-rtd-theme"] -test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] - -[[package]] -name = "trio" -version = "0.18.0" -description = "A friendly Python library for async concurrency and I/O" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -async-generator = ">=1.9" -attrs = ">=19.2.0" -cffi = {version = ">=1.14", markers = "os_name == \"nt\" and implementation_name != \"pypy\""} -idna = "*" -outcome = "*" -sniffio = "*" -sortedcontainers = "*" - -[[package]] -name = "webencodings" -version = "0.5.1" -description = "Character encoding aliases for legacy web content" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "xdg" -version = "5.1.1" -description = "Variables defined by the XDG Base Directory Specification" -category = "main" -optional = false -python-versions = ">=3.6,<4.0" - -[metadata] -lock-version = "1.1" -python-versions = "^3.8" -content-hash = "3da90f3013f1220c9081c0a11dac7d8cd05c5a47ebda40fbb4357e44503e99a3" - -[metadata.files] -anyio = [ - {file = "anyio-2.2.0-py3-none-any.whl", hash = "sha256:aa3da546ed17f097ca876c78024dea380a3b7fa80759abfdda59f12176a3dac8"}, - {file = "anyio-2.2.0.tar.gz", hash = "sha256:4a41c5b3a65ed92e469d51b6fba3779301850ea2e352afcf9e36c46f21ee14a9"}, -] -asks = [ - {file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"}, -] -async-generator = [ - {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, - {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, -] -attrs = [ - {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, - {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, -] -bidict = [ - {file = "bidict-0.21.4-py3-none-any.whl", hash = "sha256:3ac67daa353ecf853a1df9d3e924f005e729227a60a8dbada31a4c31aba7f654"}, - {file = "bidict-0.21.4.tar.gz", hash = "sha256:42c84ffbe6f8de898af6073b4be9ea7ccedcd78d3474aa844c54e49d5a079f6f"}, -] -cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, -] -cssselect2 = [ - {file = "cssselect2-0.6.0-py3-none-any.whl", hash = "sha256:3a83b2a68370c69c9cd3fcb88bbfaebe9d22edeef2c22d1ff3e1ed9c7fa45ed8"}, - {file = "cssselect2-0.6.0.tar.gz", hash = "sha256:5b5d6dea81a5eb0c9ca39f116c8578dd413778060c94c1f51196371618909325"}, -] -h11 = [ - {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, - {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -lxml = [ - {file = "lxml-4.9.0-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39"}, - {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307"}, - {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8"}, - {file = "lxml-4.9.0-cp27-cp27m-win32.whl", hash = "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3"}, - {file = "lxml-4.9.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b"}, - {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756"}, - {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18"}, - {file = "lxml-4.9.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40"}, - {file = "lxml-4.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790"}, - {file = "lxml-4.9.0-cp310-cp310-win32.whl", hash = "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a"}, - {file = "lxml-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2"}, - {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d"}, - {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb"}, - {file = "lxml-4.9.0-cp35-cp35m-win32.whl", hash = "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e"}, - {file = "lxml-4.9.0-cp35-cp35m-win_amd64.whl", hash = "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2"}, - {file = "lxml-4.9.0-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee"}, - {file = "lxml-4.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11"}, - {file = "lxml-4.9.0-cp36-cp36m-win32.whl", hash = "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba"}, - {file = "lxml-4.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09"}, - {file = "lxml-4.9.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca"}, - {file = "lxml-4.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4"}, - {file = "lxml-4.9.0-cp37-cp37m-win32.whl", hash = "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c"}, - {file = "lxml-4.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641"}, - {file = "lxml-4.9.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40"}, - {file = "lxml-4.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143"}, - {file = "lxml-4.9.0-cp38-cp38-win32.whl", hash = "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190"}, - {file = "lxml-4.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed"}, - {file = "lxml-4.9.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb"}, - {file = "lxml-4.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1"}, - {file = "lxml-4.9.0-cp39-cp39-win32.whl", hash = "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32"}, - {file = "lxml-4.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07"}, - {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a"}, - {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656"}, - {file = "lxml-4.9.0.tar.gz", hash = "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7"}, -] -outcome = [ - {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"}, - {file = "outcome-1.1.0.tar.gz", hash = "sha256:e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"}, -] -pdfrw = [ - {file = "pdfrw-0.4-py2.py3-none-any.whl", hash = "sha256:758289edaa3b672e9a1a67504be73c18ec668d4e5b9d5ac9cbc0dc753d8d196b"}, - {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, -] -pillow = [ - {file = "Pillow-9.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"}, - {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2"}, - {file = "Pillow-9.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a"}, - {file = "Pillow-9.1.1-cp310-cp310-win32.whl", hash = "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c"}, - {file = "Pillow-9.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108"}, - {file = "Pillow-9.1.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4"}, - {file = "Pillow-9.1.1-cp37-cp37m-win32.whl", hash = "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578"}, - {file = "Pillow-9.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9"}, - {file = "Pillow-9.1.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf"}, - {file = "Pillow-9.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a"}, - {file = "Pillow-9.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1"}, - {file = "Pillow-9.1.1-cp38-cp38-win32.whl", hash = "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54"}, - {file = "Pillow-9.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf"}, - {file = "Pillow-9.1.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92"}, - {file = "Pillow-9.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1"}, - {file = "Pillow-9.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601"}, - {file = "Pillow-9.1.1-cp39-cp39-win32.whl", hash = "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45"}, - {file = "Pillow-9.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"}, - {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"}, -] -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] -pyfuse3 = [ - {file = "pyfuse3-3.2.1.tar.gz", hash = "sha256:22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33"}, -] -reportlab = [ - {file = "reportlab-3.6.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4ba8eebfa4383e4680d6e7e6dba9c45c1fe19bbc0a754db4d84823f1a9511e56"}, - {file = "reportlab-3.6.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37dda88dbe16dd3f4f9039464637cce66e462c0b95e5763dbd45ac5799136d3a"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10681d89a0ca37bb4036283fb8c0efac9ac1b22265dbdf350bda0448be33e00c"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cebd0b28a0e875a9ce789514700f80659269ecf2a8fcef0aa10b8ae52b40474a"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ec84055cf2c83783958b74eadf0e577eb0cd9088c8b5d536e9ddc0f4a9f8c70"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:90f74627cafecf3924741ab8b0690a19df4214eb56b1cfce2dc74a15c9744034"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2c2fd861f10b2cd49ccf29a31da9ad5c3b95aa437804e4fd0351ed4eb695f74"}, - {file = "reportlab-3.6.9-cp310-cp310-win32.whl", hash = "sha256:e492e87886423192af1fafde23907bcd9d2fdccfc22f67e18aa5c73db3a380a3"}, - {file = "reportlab-3.6.9-cp310-cp310-win_amd64.whl", hash = "sha256:d1bf9455aff37beb421a4447d89d6dd77bb46f677c0bab4eb0272cdb79faad2f"}, - {file = "reportlab-3.6.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0a7f2b7232c3ffb451b649d55c51a6dd0c8104ad7bbcfe355addf7619705e7fa"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1967dbc9930917d75c39784712a137d432dbc2e5ca9e132a2453319c2619ccff"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:32a5c5cd9625a40feec956f460355b4813bc3187c4f8dc9efd9f1a7f8f854e34"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8cb82b6d14ad4bd915acacc8f114c6a7bab8b9b1503cabb930e433ebd320f90c"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0e767cf4507ca8eed7dde8511f0889b0f19f160a2bdf9ef07742b2aaeceed9f2"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a114761ad3ba6e0cdfacf14a8fb2cb8f5713b115ca1f0c17f3cd638d0a5b4bd"}, - {file = "reportlab-3.6.9-cp37-cp37m-win32.whl", hash = "sha256:bbaab798991863952c593c0459dcb82e0aade837675593310e13cba2ce7fb45a"}, - {file = "reportlab-3.6.9-cp37-cp37m-win_amd64.whl", hash = "sha256:ab1ffe4ec7be99ad348791116d436610afdc7a9a02a968997f31eaa62eaadad8"}, - {file = "reportlab-3.6.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:496f42840604255ce06777bc129048b3bab966213bbac4f07fbe4ceb6a2e0482"}, - {file = "reportlab-3.6.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a441afdfe31870b964bccde042d7172ed3c0077f519bbf3ed7d9d34c406b6b91"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4fbe23ac870adf90544d2014c572dba6ec4d772afad6505bb91f171ddad12839"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de724c78f4eb1363b1195dce85a2a8806e7509b69ac5c842a714d942ea534d63"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:713574da534b6ce73d884f1574c35a565e438af4888fcc75e752f1de02e356a7"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:193671445b4885128d8800d3e416eb2fa4fd89bafae08cc9889c0752fe5ad8c2"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff0e014a3a3fe286c642ef51213c41684a156b9ed293ef205e8890bc1dbbfdc7"}, - {file = "reportlab-3.6.9-cp38-cp38-win32.whl", hash = "sha256:23f5aed2d212096f2fe95d56f868d63f839a08bf7e389237e644d93981274222"}, - {file = "reportlab-3.6.9-cp38-cp38-win_amd64.whl", hash = "sha256:09b2ca175129a34292399fc4c6a8b1739f6c5946368fcaa6f931d69385b2f720"}, - {file = "reportlab-3.6.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cb21666fc9edec9716553bfcfe0c30d1bbbe2731910a96f07ec65652974e5f83"}, - {file = "reportlab-3.6.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d927bf802bf53c1b5a3878a22e9be310900877984e7c436a3a99bdd19cfec4c3"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce3a3aad287c8532f62223f5720b5504e31abe3dce52a27bd2a25f508c0d846e"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9a5f63bc381c0f945402ef4c1bccc74a8eed28f6be6596704b1db7d82ec89fe"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:50f8e30f5410efc69b0217261b1f21912888da392a4549e79c7aaaac85f01bfa"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:15294435f786968bcdf1a7a67bcc23a136470b6ea26919497f5c76ff0f653041"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9b5e9115363545a727d8ebe7e4b94f7cf6f26113261a269d50d88b8db4eb726"}, - {file = "reportlab-3.6.9-cp39-cp39-win32.whl", hash = "sha256:e1fc1b1f5d9d1c2e18b5e60602dfa7854b2330ba0efc312ef605abf588abea9c"}, - {file = "reportlab-3.6.9-cp39-cp39-win_amd64.whl", hash = "sha256:92a6613af9877e3ad2a1c5a16a122514a4f9f8d9b91b1f22e7fa0fa796617b36"}, - {file = "reportlab-3.6.9.tar.gz", hash = "sha256:5d0cc3682456ad213150f6dbffe7d47eab737d809e517c316103376be548fb84"}, -] -rmcl = [ - {file = "rmcl-0.4.2-py3-none-any.whl", hash = "sha256:09534999cd233e5e8db531e51aab87eee7d72aa5a2592bcf100e2d015110cf52"}, - {file = "rmcl-0.4.2.tar.gz", hash = "sha256:58de4758e7e3cb7acbf28fcfa80f4155252afdfb191beb4ba4aa36961f66cc67"}, -] -rmfuse = [] -rmrl = [ - {file = "rmrl-0.2.1-py3-none-any.whl", hash = "sha256:c35b9f20494a6034a16e916d7351575efb3e3f77acabe9094453a7f6013eaa86"}, - {file = "rmrl-0.2.1.tar.gz", hash = "sha256:c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -sortedcontainers = [ - {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"}, - {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, -] -svglib = [ - {file = "svglib-1.3.0.tar.gz", hash = "sha256:a38998b95d1bb99564dc9dffaf15e4e9453761f2790d2dd4147a4ad5fbac1078"}, -] -tinycss2 = [ - {file = "tinycss2-1.1.1-py3-none-any.whl", hash = "sha256:fe794ceaadfe3cf3e686b22155d0da5780dd0e273471a51846d0a02bc204fec8"}, - {file = "tinycss2-1.1.1.tar.gz", hash = "sha256:b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf"}, -] -trio = [ - {file = "trio-0.18.0-py3-none-any.whl", hash = "sha256:a42af0634ba729cbfe8578be058750c6471dac19fbc7167ec6a3ca3f966fb424"}, - {file = "trio-0.18.0.tar.gz", hash = "sha256:87a66ae61f27fe500c9024926a9ba482c07e1e0f56380b70a264d19c435ba076"}, -] -webencodings = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] -xdg = [ - {file = "xdg-5.1.1-py3-none-any.whl", hash = "sha256:865a7b56ed1d4cd2fce2ead1eddf97360843619757f473cd90b75f1817ca541d"}, - {file = "xdg-5.1.1.tar.gz", hash = "sha256:aa619f26ccec6088b2a6018721d4ee86e602099b24644a90a8d3308a25acd06c"}, -] diff --git a/pkgs/tools/filesystems/rmfuse/pyproject.toml b/pkgs/tools/filesystems/rmfuse/pyproject.toml deleted file mode 100644 index e3f1767b4cfa..000000000000 --- a/pkgs/tools/filesystems/rmfuse/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[tool.poetry] -name = "rmfuse-env" -version = "0.1.0" -description = "" -authors = [] - -[tool.poetry.dependencies] -python = "^3.8" -rmfuse = {git = "https://github.com/rschroll/rmfuse.git", extras = ["pyfuse3"]} - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/tools/filesystems/rmfuse/update deleted file mode 100755 index 77cfe9ff86d9..000000000000 --- a/pkgs/tools/filesystems/rmfuse/update +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p poetry poetry2nix.cli -set -eu -poetry lock -poetry2nix lock diff --git a/pkgs/tools/filesystems/rnm/default.nix b/pkgs/tools/filesystems/rnm/default.nix new file mode 100644 index 000000000000..69ba0270ecc0 --- /dev/null +++ b/pkgs/tools/filesystems/rnm/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, gmp +, jpcre2 +, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "rnm"; + version = "4.0.9"; + + src = fetchFromGitHub { + owner = "neurobin"; + repo = "rnm"; + rev = "refs/tags/${version}"; + hash = "sha256-cMWIxRuL7UCDjGr26+mfEYBPRA/dxEt0Us5qU92TelY="; + }; + + buildInputs = [ + gmp + jpcre2 + pcre2 + ]; + + meta = with lib; { + homepage = "https://neurobin.org/projects/softwares/unix/rnm/"; + description = "Bulk rename utility"; + changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog"; + platforms = lib.platforms.all; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index d0a1e0916367..bfe9f2274756 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,15 +4,21 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.3"; + version = "2.0.2"; src = fetchFromGitHub { - sha256 = "sha256-DOf+kpflDd2U1nXDLKYts/yf121CrBFIBI47OQa5XBs="; + sha256 = "sha256-xmOtL4v3UxdjrL09sSfXyF5FoMrNerSqG9nvEuwMvNM="; rev = version; repo = "s3backer"; owner = "archiecobbs"; }; + patches = [ + # from upstream, after latest release + # https://github.com/archiecobbs/s3backer/commit/303a669356fa7cd6bc95ac7076ce51b1cab3970a + ./fix-darwin-builds.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; @@ -22,11 +28,6 @@ stdenv.mkDerivation rec { 'AC_CHECK_DECLS(fdatasync)' "" ''; - autoreconfPhase = '' - patchShebangs ./autogen.sh - ./autogen.sh - ''; - meta = with lib; { homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; diff --git a/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch new file mode 100644 index 000000000000..e5755f1cb9b0 --- /dev/null +++ b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch @@ -0,0 +1,25 @@ +From 303a669356fa7cd6bc95ac7076ce51b1cab3970a Mon Sep 17 00:00:00 2001 +From: Adrian Ho +Date: Tue, 6 Sep 2022 10:49:10 +0800 +Subject: [PATCH] Enable macOS builds + +macOS requires explicit `environ` declaration. +--- + s3backer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/s3backer.h b/s3backer.h +index ccc9053..383e246 100644 +--- a/s3backer.h ++++ b/s3backer.h +@@ -90,6 +90,10 @@ + #include + #include + ++#ifdef __APPLE__ ++extern char **environ; ++#endif ++ + #ifndef FUSE_OPT_KEY_DISCARD + #define FUSE_OPT_KEY_DISCARD -4 + #endif \ No newline at end of file diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index d31e466331c0..58ef6442d8d0 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/filesystems/simple-mtpfs/default.nix b/pkgs/tools/filesystems/simple-mtpfs/default.nix new file mode 100644 index 000000000000..3cb2aa97007b --- /dev/null +++ b/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/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 7e0c30ebf19c..0b16c7465294 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8="; + hash = "sha256-PM+griFtuFT9g+Pqx33frWrucVCXSzfyWAJJXAzrMtI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q="; + hash = "sha256-P5GKMNifnEvGcsg0hGZn6hg3/S44fUIzqf5Qjp4R/EM="; }; postPatch = '' diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix new file mode 100644 index 000000000000..0aed7016feac --- /dev/null +++ b/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/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index cd18b8b09df5..203c58b8f619 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -1,16 +1,16 @@ { 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 ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-next pyudev xlib ]; postInstall = '' # autostart file diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 2b17fa796e84..f06021693504 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { LINKFLAGS += ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)} - -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss + -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ljpeg -ltiff -lpng -lssl ; ''; in '' diff --git a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch deleted file mode 100644 index 13e18fd04476..000000000000 --- a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 53ce5fe7e73d7ed95c9e12b52dd4984723f865fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= -Date: Sun, 6 Apr 2014 21:25:27 +0200 -Subject: [PATCH] fix build with leptonica 1.70 - ---- - configure.ac | 1 + - src/jbig2.cc | 13 +++++++++---- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe37c22..753a607 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [ - echo "Error! Leptonica not detected." - exit -1 - ]) -+AC_CHECK_FUNCS(expandBinaryPower2Low,,) - # test for function - it should detect leptonica dependecies - - # Check for possible dependancies of leptonica. -diff --git a/src/jbig2.cc b/src/jbig2.cc -index e10f042..515c1ef 100644 ---- a/src/jbig2.cc -+++ b/src/jbig2.cc -@@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) { - // input color image, so we have to do it this way... - // is there a better way? - // PIX *pixd = pixExpandBinary(pixd4, 4); -- PIX *pixd = pixCreate(piximg->w, piximg->h, 1); -- pixCopyResolution(pixd, piximg); -- if (verbose) pixInfo(pixd, "mask image: "); -- expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, -+ PIX *pixd; -+#ifdef HAVE_EXPANDBINARYPOWER2LOW -+ pixd = pixCreate(piximg->w, piximg->h, 1); -+ pixCopyResolution(pixd, piximg); -+ expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, - pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4); -+#else -+ pixd = pixExpandBinaryPower2(pixd4, 4); -+#endif -+ if (verbose) pixInfo(pixd, "mask image: "); - - pixDestroy(&pixd4); - pixDestroy(&pixsf4); diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix deleted file mode 100644 index ea5008dcf5cb..000000000000 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: - -stdenv.mkDerivation rec { - pname = "jbig2enc"; - version = "0.28"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "jbig2enc"; - rev = "${version}-dist"; - hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY="; - }; - - propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; - - patches = [ - # https://github.com/agl/jbig2enc/commit/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa - ./53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch - ]; - - # This is necessary, because the resulting library has - # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib - # in its rpath, which means that patchelf --shrink-rpath removes - # the /nix/store one. By cleaning up before fixup, we ensure that - # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. - preFixup = '' - make clean - ''; - - meta = { - description = "Encoder for the JBIG2 image compression format"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/tools/graphics/libyafaray/default.nix index db48aa678cc5..22bbfddbcf5d 100644 --- a/pkgs/tools/graphics/libyafaray/default.nix +++ b/pkgs/tools/graphics/libyafaray/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-UVBA1vXOuLg4RT+BdF4rhbZ6I9ySeZX0N81gh3MH84I="; }; + postPatch = '' + sed '1i#include ' -i \ + include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 + ''; + preConfigure = '' NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" ''; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index a2adb7ee61d9..e63875c19cd3 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: +{ lib +, stdenv +, fetchzip +, autoreconfHook +, dos2unix +, doxygen +, freeimage +, libpgf +}: stdenv.mkDerivation rec { pname = "pgf"; - version = "6.14.12"; + version = "7.21.7"; - src = fetchurl { - url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; - sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0"; + src = fetchzip { + url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip"; + hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0="; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool dos2unix libpgf freeimage doxygen ]; - - patchPhase = '' - sed 1i'#include ' -i src/PGF.cpp - sed s/__int64/int64_t/g -i src/PGF.cpp - rm include/FreeImage.h include/FreeImagePlus.h + postPatch = '' + find . -type f | xargs dos2unix + mv README.txt README ''; - preConfigure = "dos2unix configure.ac; sh autogen.sh"; + nativeBuildInputs = [ + autoreconfHook + dos2unix + doxygen + ]; -# configureFlags = optional static "--enable-static --disable-shared"; + buildInputs = [ + freeimage + libpgf + ]; meta = { homepage = "https://www.libpgf.org/"; diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index aed3d485c4ad..d750d243fc36 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchfossil +, tcl + +, enableTcl ? true }: stdenv.mkDerivation { @@ -19,14 +22,27 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace open "test -f" ''; + nativeBuildInputs = lib.optional enableTcl tcl.tclPackageHook; + + buildInputs = lib.optional enableTcl tcl; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = [ "pikchr" ] ++ lib.optional enableTcl "piktcl"; + installPhase = '' + runHook preInstall install -Dm755 pikchr $out/bin/pikchr install -Dm755 pikchr.out $out/lib/pikchr.o install -Dm644 pikchr.h $out/include/pikchr.h + '' + lib.optionalString enableTcl '' + cp -r piktcl $out/lib/piktcl + '' + '' + runHook postInstall ''; + dontWrapTclBinaries = true; + doCheck = true; checkTarget = "test"; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 3ee17eb630a1..ac5855304f4a 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -7,14 +7,15 @@ , libjpeg , gd , freetype +, runCommand }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ploticus"; version = "2.42"; src = fetchurl { - url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz"; + url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_src.tar.gz"; sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; @@ -42,6 +43,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postPatch = '' + substituteInPlace src/pl.h --subst-var out + ''; + preBuild = '' cd src ''; @@ -62,6 +67,16 @@ stdenv.mkDerivation rec { ln -s "pl" "$out/bin/ploticus" ''; + passthru.tests = { + prefab = runCommand "ploticus-prefab-test" { + buildInputs = [ finalAttrs.finalPackage ]; + } '' + # trivial test to see if the prefab path munging works + mkdir $out/ + pl -prefab scat inlinedata="A 1 2" x=2 y=3 -png -o $out/out.png + ''; + }; + meta = with lib; { description = "A non-interactive software package for producing plots and charts"; longDescription = '' @@ -77,4 +92,4 @@ stdenv.mkDerivation rec { homepage = "https://ploticus.sourceforge.net/"; platforms = with platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index f48fcd4a451f..db546583f37c 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/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/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 14831c70b047..db44108112f3 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -8,9 +8,10 @@ , Foundation , python3 , fetchFromGitHub -, fetchpatch -, autoreconfHook +, meson +, ninja , gtk-doc +, docbook-xsl-nons , gobject-introspection # Optional dependencies , libjpeg @@ -38,15 +39,15 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.13.3"; + version = "8.14.1"; - outputs = [ "bin" "out" "man" "dev" ]; + outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo="; + hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -56,9 +57,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - autoreconfHook - gtk-doc + meson + ninja + docbook-xsl-nons gobject-introspection + ] ++ lib.optionals (!stdenv.isDarwin) [ + gtk-doc ]; buildInputs = [ @@ -95,11 +99,17 @@ stdenv.mkDerivation rec { glib ]; - autoreconfPhase = '' - NOCONFIGURE=1 ./autogen.sh - ''; + mesonFlags = [ + "-Dcgif=disabled" + "-Dspng=disabled" + "-Dpdfium=disabled" + "-Dnifti=disabled" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-Dgtk_doc=true" + ]; meta = with lib; { + changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index a5581e7d6f1d..003a3c18bfbf 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , cmake +, ffmpeg , libdrm , libglvnd , libffi @@ -29,6 +30,7 @@ let # does not search for system-wide installations. # It also expects the version specified in the repository, which can be incompatible # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + # The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290 amber = fetchFromGitHub { owner = "google"; repo = "amber"; @@ -44,43 +46,49 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; - hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + rev = "a0ad0d7067521fff880e36acfb8ce453421c3f25"; + hash = "sha256-ZKkFHGitLjw5LPJW1TswIJ+KulkrS8C4G3dUF5U/F2c="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; - hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + rev = "f98473ceeb1d33700d01e20910433583e5256030"; + hash = "sha256-RSUmfp9QZ7yRbLdFygz9mDfrgUUT8og+ZD9/6VkghMo="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; - hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + rev = "87d5b782bec60822aa878941e6b13c0a9a954c9b"; + hash = "sha256-Bv10LM6YXaH2V64oqAcrps23higHzCjlIYYBob5zS4A="; + }; + video-parser = fetchFromGitHub { + owner = "nvpro-samples"; + repo = "vk_video_samples"; + rev = "7d68747d3524842afaf050c5e00a10f5b8c07904"; + hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; - hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + rev = "9a2e576a052a1e65a5d41b593e693ff02745604b"; + hash = "sha256-DBA2FeV0G/HI8GUMtGYO52jk7wM4HMlKLDA4b+Wmo+k="; }; in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.4.1"; + version = "1.3.5.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA="; }; outputs = [ "out" "lib" ]; prePatch = '' - mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + mkdir -p external/renderdoc/src external/spirv-headers external/video-parser external/vulkan-docs cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h @@ -89,11 +97,13 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${glslang} external/glslang/src cp -r ${spirv-tools} external/spirv-tools/src cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${video-parser} external/video-parser/src cp -r ${vulkan-docs} external/vulkan-docs/src chmod u+w -R external ''; buildInputs = [ + ffmpeg libdrm libffi libglvnd diff --git a/pkgs/tools/graphics/wgpu-utils/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix index 745640bfa228..ce445ce6a00f 100644 --- a/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; rev = "v${version}"; - hash = "sha256-Yfq85stS1FWahrwv+8hEFSAGr2eZHJ+/cuNYfIFRi3c="; + hash = "sha256-MdomiE/qHpyVFlgH5wGsFDiXIp6p1wHXsAtmlo/XfEg="; }; - cargoHash = "sha256-R8x3QfVWyEyz7o9Jzh+XgQKYF8HZMAPwbq847j2LfqY="; + cargoHash = "sha256-83iQ/YcItRsTfp73xi5LZF8AyvyAXJCHuNWXgc1wHkM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 73344ca26900..497a4abc5956 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/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/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 298de6a641ef..ff9786cfe3ba 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/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/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix index f1ac559fb672..ef3ffc873aa9 100644 --- a/pkgs/tools/misc/bdfresize/default.nix +++ b/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/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix new file mode 100644 index 000000000000..6c42e7131c86 --- /dev/null +++ b/pkgs/tools/misc/boxxy/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "boxxy"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "queer"; + repo = "boxxy"; + rev = "v${version}"; + hash = "sha256-bFDGZhwawOPzXR0ODD61h/wVUibNVl7ayiV9jfvTI6c="; + }; + + cargoHash = "sha256-oO0cb5PZ2BdJnB+Uyu5ZHpYR5znoeGa/RpyQAXLlrBQ="; + + meta = with lib; { + description = "Puts bad Linux applications in a box with only their files"; + homepage = "https://github.com/queer/boxxy"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya figsoda ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 257e75628ed2..4daab1ef99c6 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-+bOdUjBMxYT4qbZ8g5l0pDZJhXaeuYVygb13sx7mg28="; + hash = "sha256-W8B4e8x9IoINR4NSm8jVBqXZbe1T/4z3RVmNrLVzV1M="; }; - cargoHash = "sha256-r/oj5ZgBjJXowFa95GKPACruH3bnPHjjyaSRewogXHQ="; + cargoHash = "sha256-XEvIqzSkusOv+boNZbTRxXVN566SduNDcZSkomJRMsk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 20c4221a0816..d57475fb5938 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU="; + sha256 = "sha256-2YL+ncT1UcanslFnMIMonvGugD7HxO6taYZtKK6kmEc="; }; - vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64="; + vendorHash = "sha256-eAWgLR3wqcTmlA3hG9IGgTm/Q+EKcypXYXRdtRAb94o="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 84ed3aaa6fe1..93a6eea3111b 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.29.4"; + version = "2.30.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-pvSKLWek/nCVjlfvYQIefvTt+VMmNYs58/4bPQQdfNU="; + hash = "sha256-Pp6QhOGG5nDc5wHIykEXIS0tQj7gPifYN5HM9tfKMR4="; }; - vendorHash = "sha256-hGYcfERYxSEg+j9EDDGYVar69HoApSqxWH8IWwHaOKs="; + vendorHash = "sha256-EPFy9fgdVN0wdMm3zWXuLqxkmIP1Fg0hOTBbeI6w4gI="; doCheck = false; diff --git a/pkgs/tools/misc/codevis/default.nix b/pkgs/tools/misc/codevis/default.nix new file mode 100644 index 000000000000..6ec698910c39 --- /dev/null +++ b/pkgs/tools/misc/codevis/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, oniguruma +}: + +rustPlatform.buildRustPackage rec { + pname = "codevis"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "sloganking"; + repo = "codevis"; + rev = "v${version}"; + hash = "sha256-dkzBLDZK0BJ069mlkXMGtuDodZr9sxFmpEXjp5Nf0Qk="; + }; + + cargoHash = "sha256-/2sBd2RAOjGTgXMocuKea1qhkXj81vM8PlRhYsJKx5g="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + oniguruma + ]; + + RUSTONIG_SYSTEM_LIBONIG = true; + + meta = with lib; { + description = "A tool to take all source code in a folder and render them to one image"; + homepage = "https://github.com/sloganking/codevis"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0ace2196ed8c..0a4577b9f9c9 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/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/pkgs/tools/misc/eget/default.nix b/pkgs/tools/misc/eget/default.nix index c0c8a2a54794..a162e7056052 100644 --- a/pkgs/tools/misc/eget/default.nix +++ b/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/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 04abea26cabc..b9b5bfcc021b 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20221213.0"; + version = "20230214.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LwP+LBHzEWjPUih6aaZnI7Yh85vsa1Md1YgBWkLOUIs="; + hash = "sha256-TfQIvvLLsYubLbai2RNJkCu96nYFEWbdZU8WaJbpUwU="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 848a1c1dbb56..ec0d2e91b664 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2022.12.8"; + version = "2023.2.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VKxCdejQGWLYeNOxa1PCwhdrLilnsYD9UBqj8Sen+OM="; + hash = "sha256-AhajZ9FaeG2WneYS2Gc8JU1Cii4StU+k+WMFF/fgP1w="; }; postPatch = '' diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 5ebbbe1e118b..5850fada2a70 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , libmnl , pkg-config , writeScript @@ -8,13 +9,23 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1URsk95XDOaPOx6mnb+hL8/Wf8GYl/ZV0/GCMeK4GNY="; + sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; }; + patches = [ + # Patch that fixes build with musl libc + # NOTE remove on next release, since it is applied in upstream + (fetchpatch { + name = "Fix-build-with-musl-libc.patch"; + url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; + sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/tools/misc/f2/default.nix index 943ce72cc6ce..48b14b867059 100644 --- a/pkgs/tools/misc/f2/default.nix +++ b/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/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 18ffdb71cde4..6d96c33e5eef 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/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/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 03be0c8b3be3..806d1bc24bdc 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.43"; + version = "5.44"; src = fetchurl { urls = [ "https://astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-jIAV6Rrg6NAyHZTHgjmJLvnbxwxK3gAIwOlYlKv7GZE="; + sha256 = "sha256-N1HH+6jbyDHLjXzIr/IQNUWbjOUVXviwiAon0ChHXzs="; }; strictDeps = true; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b522499d7909..615cca201814 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "flashrom"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; - hash = "sha256-iaf/W+sIyJuHlbvSU6UblFNUeoZMMXkzAilrVrvFbWU="; + hash = "sha256-oFMjRFPM0BLnnzRDvcxhYlz5e3/Xy0zdi/v/vosUliM="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ lib.optional jlinkSupport libjaylink; postPatch = '' - substituteInPlace util/z60_flashrom.rules \ + substituteInPlace util/flashrom_udev.rules \ --replace "plugdev" "flashrom" ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; postInstall = '' - install -Dm644 util/z60_flashrom.rules $out/lib/udev/rules.d/flashrom.rules + install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules ''; meta = with lib; { diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 50f51cfd7119..4cd81c8c640f 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/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/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 2c78a0a62136..cefc80d3fe0c 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-kgjLjGloudigDTP6K4W8Tv42uK/dHyH1W2aI9+uh/ws="; + sha256 = "sha256-jHbxROO21cgbhEiWv9wQJyHWGGK14nGQuk9Fc9ufHqg="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index fa6df2cebff4..7b59dd92df46 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-m+tKNz7tUWkm/Vg9DhcfZyaBgZh+Mcf0mRfc5/SW2Os="; + hash = "sha256-XZ0S6cps3WIMqWUHivXPKSN2PiZsSEmETnu9sglwXKw="; }; vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ="; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index ba9117a29722..77be76f2d2ed 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/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/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index c690df170b84..131db58c0b80 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -1,22 +1,32 @@ { lib , fetchFromGitHub , buildGoModule +, testers +, gh-dash }: buildGoModule rec { pname = "gh-dash"; - version = "3.6.0"; + version = "3.7.6"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-pQd41uQdfkbqIjdUIwUnKS/Qso495Ips8P2CXPd8JRU="; + hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg="; }; vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/dlvhdr/gh-dash/cmd.Version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { package = gh-dash; }; + }; meta = { description = "gh extension to display a dashboard with pull requests and issues"; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index eeca15dddd41..dd550df598c4 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cLbAxF1g+N6XcpZS5+jDTykkbXoK7seKEmhCkp6noo8="; + sha256 = "sha256-yoio22D8k4rO8lRLoGSJGl8raMVO9fOGHFobAZngcxw="; }; - vendorSha256 = "sha256-VpmSTNO3XgZpOu2OToq5HUJTagX9Hg7a65Cqgr8IlkU="; + vendorSha256 = "sha256-RSAT9VtsdXvWDhIZlOjwCF9nhONPXCSEaxVlgW14IKA="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ca12c1f25887..16db1cb2ef1a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -386,9 +386,7 @@ stdenv.mkDerivation rec { # save target that grub is compiled for grubTarget = if efiSupport then "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi" - else if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + else lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; doCheck = false; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2d07932dab2e..e4efceea888d 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -103,10 +103,7 @@ stdenv.mkDerivation rec { ]; # save target that grub is compiled for - grubTarget = - if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + grubTarget = lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; doCheck = false; # On -j16 races with early header creation: diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 051e98862bd2..3bde0466cdba 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchpatch , fetchurl , fixDarwinDylibNames @@ -95,13 +96,15 @@ stdenv.mkDerivation rec { "NC_TEST-nctest" ]; - checkPhase = let excludedTestsRegex = if (excludedTests != []) - then "(" + (lib.concatStringsSep "|" excludedTests) + ")" - else ""; in '' - runHook preCheck - ctest -E "${excludedTestsRegex}" --output-on-failure - runHook postCheck - ''; + checkPhase = + let + excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; + in + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; outputs = [ "bin" "dev" "out" ]; @@ -117,7 +120,7 @@ stdenv.mkDerivation rec { szip javaSupport jdk - ; + ; }; meta = with lib; { diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index 1eb1080c16b8..f44787924d94 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Hyde46"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WCyu6vW0l8J2Xh8OGXMXVDBs287m2nPlRHeA0j8uvlk="; + sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; }; buildInputs = [ ncurses openssl ] @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-Cku9NnrjWT7VmOCryb0sbCQibG+iU9CHT3Cvd6M/9f4="; + cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index f4629f4867fd..5bb1559af2d2 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.16"; + version = "0.10.17"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-HvDUL6hrWLJtwPA2gPiCLVmNA+O29+bIAMNNgBHu+XA="; + sha256 = "sha256-lAHZ6G7DnK2Pu3If5qZ12UF/NYNgd9utiz/dgkgJcjk="; }; - vendorHash = "sha256-S51NwHeJm3gSJ+9r8RgGY3zHJFddI8uNfYSpQl33M3M="; + vendorHash = "sha256-hfJY0yKr0OsgMKtVkfkbQ6nLGPnyS+PT23qQwuXiuqs="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index e920a587fe3b..7f9a33927db9 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "instaloader"; - version = "4.9.5"; + version = "4.9.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "instaloader"; repo = "instaloader"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3uO5EVK5mR3BwDF885onEraP3NYACTRwnGOsM009uig="; + sha256 = "sha256-ZxvJPDj+r7KSyXpYNQIgnda5OS77GOFM901ZHgR6c4k="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index c61398a78dc4..555f4a529b92 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "intermodal"; @@ -8,19 +8,28 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68"; + hash = "sha256-yPyKo2j0Up8gDzi2xOBqpMwIw6rpXDCxc8fCuEblwFY="; }; - cargoSha256 = "1bvs23rb25qdwbrygzq11p8cvck5lxjp9llvs1cjdh0qzr65jwla"; + cargoHash = "sha256-inJZTP4YwCZZ0JvSdGWnZbLN0A0B/+fz4g0XsfIQeq8="; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd imdl \ + --bash <($out/bin/imdl completions bash) \ + --fish <($out/bin/imdl completions fish) \ + --zsh <($out/bin/imdl completions zsh) + ''; + meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; homepage = "https://github.com/casey/intermodal"; license = licenses.cc0; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne xrelkd ]; mainProgram = "imdl"; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 65c88eac4e88..c3a0c5aa906d 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -48,16 +48,6 @@ stdenv.mkDerivation rec { substituteInPlace src/util/genfsimg --replace " syslinux " " true " ''; # calling syslinux on a FAT image isn't going to work - # Workaround '-idirafter' ordering bug in staging-next: - # https://github.com/NixOS/nixpkgs/pull/210004 - # where libc '-idirafter' gets added after user's idirafter and - # breaks. - # TODO(trofi): remove it in staging once fixed in cc-wrapper. - preConfigure = '' - export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) - export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) - ''; - # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 3b11dfcb64fd..a3bb87d56cca 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/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/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix index 3d71482d4ead..9a9fa5c9162a 100644 --- a/pkgs/tools/misc/kakoune-cr/default.nix +++ b/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/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 02e783fa1e09..ef31e582f5c1 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/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/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index dd0d34f50fe5..2b9ba694d3f6 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/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/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index a7212ccf7648..19f4c455965f 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/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/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix index b880c66f971c..5662b356f34e 100644 --- a/pkgs/tools/misc/license-generator/default.nix +++ b/pkgs/tools/misc/license-generator/default.nix @@ -1,20 +1,20 @@ { lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "license-generator"; - version = "0.8.1"; + pname = "license-generator"; + version = "1.0.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; - }; + src = fetchCrate { + inherit pname version; + hash = "sha256-ijA/AqLeQ9/XLeCriWNUA6R3iKyq+QPDH5twSvqFmEA="; + }; - cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + cargoHash = "sha256-FfkCV4anPHElGGIOYDSzHam5ohVGpOgtu/nM0aw9HzU="; - meta = with lib; { - description = "Command-line tool for generating license files"; - homepage = "https://github.com/azu/license-generator"; - license = licenses.mit; - maintainers = with maintainers; [ loicreynier ]; - }; + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; } diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/tools/misc/lipl/default.nix new file mode 100644 index 000000000000..b24fcaa3d2d1 --- /dev/null +++ b/pkgs/tools/misc/lipl/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "lipl"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "yxdunc"; + repo = "lipl"; + rev = "v${version}"; + hash = "sha256-ZeYz9g06vMsOk3YDmy0I+8e6BtLfweXqVH5uRt+mtes="; + }; + + cargoHash = "sha256-hcvC12dd6KDi7kYilXtBtyDQQG62YPMvSZA5trFqwWc="; + + meta = with lib; { + description = "A command line tool to analyse the output over time of custom shell commands"; + homepage = "https://github.com/yxdunc/lipl"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 5a68c7697cc4..211df2186f78 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/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/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e245a05182da..8fdee47befbf 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ liblockfile ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=format-overflow" + ]; + installPhase = '' runHook preInstall mkdir -p $out/bin $out/man/man1 diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index a2dae74457df..547bbba89046 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.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/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index dc446d3f0a19..46bf31ed667e 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3wLfQvbwx+OFrCl5vMV7Zps4e4iEYFhqPiVCo5hDqgw="; })]; + postPatch = '' + sed '1i#include ' -i src/Log.cxx # gcc12 + ''; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ libmpdclient diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/tools/misc/mpy-utils/default.nix new file mode 100644 index 000000000000..ea816126858b --- /dev/null +++ b/pkgs/tools/misc/mpy-utils/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, python3, buildPythonApplication, fetchPypi, fusepy, pyserial }: + +buildPythonApplication rec { + pname = "mpy-utils"; + version = "0.1.13"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4="; + }; + + propagatedBuildInputs = [ fusepy pyserial ]; + + meta = with lib; { + description = "MicroPython development utility programs"; + homepage = "https://github.com/nickzoic/mpy-utils"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 5b154c8c9ace..1cd914bec657 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.3"; + version = "0.16.5"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw="; + sha256 = "sha256-Rn3aXwez/WUGpuRvA6lkuECchpYek8KDMh6xzZOV9v0="; }; - vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno="; + vendorHash = "sha256-EkLeB2zUJkKCWsJxMiYHSDgr0/8X24MT0Jp0nuYebds="; doCheck = false; diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 207de747d2c5..84c71bd85d07 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.3.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-R5B49648X9UP2al4VRRAl/T9clgvCztYxpbDHwQmDM8="; + sha256 = "sha256-5QuNv6sRr/pfw0Vk+jfSjpowWfsD4kh7c2YoEEuUeKE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index bebe77faaa7d..40c060b63155 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "noti"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA="; + hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 232c913d4a77..0909e0059c9a 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-MgjCfYYv4tBZHsoj9oXGKYOQb0Anp0zVD/vc+UpAiAc="; + sha256 = "sha256-SQOiVHhdwOmzWVPtr1hw9oz8G/xjz5HghYcNN/u3ITo="; }; - vendorSha256 = "sha256-8TQVpJ02EPve1OUP6RHbvwBug8larSO3BgBiCfL2614="; + vendorSha256 = "sha256-Ffmz7c/FMtXjmanZYp8vquxUu+eSTqtR5nesNdN/F0c="; doCheck = false; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 67ac3c0f40a2..e9448f84fd24 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.70.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY="; + sha256 = "sha256-Y6HSz81edWklXhTbaK9LvdwmgNPRMtI1BD0IfcjWl3I="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM="; + vendorHash = "sha256-Zi9Rkfm+y0jZySwMJxAa5Sx/r5WAYvOVez3J0yQza2w="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 0429e854338b..0ad5b060119e 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/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/pkgs/tools/misc/pandoc-katex/default.nix b/pkgs/tools/misc/pandoc-katex/default.nix index 6a56651221cf..fdcfef878449 100644 --- a/pkgs/tools/misc/pandoc-katex/default.nix +++ b/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/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index af19108ff210..05367d2e52ba 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/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/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index aeb978ec3163..18c48f2b15cd 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/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/pkgs/tools/misc/pkgtop/default.nix b/pkgs/tools/misc/pkgtop/default.nix new file mode 100644 index 000000000000..1d2f0c048f26 --- /dev/null +++ b/pkgs/tools/misc/pkgtop/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pkgtop"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "pkgtop"; + rev = version; + hash = "sha256-Skk7Zur2UMxNjrJmcp+FvUuNvbh9HmzuZ5mWcvhxcKk="; + }; + + vendorHash = "sha256-dlDbNym7CNn5088znMNgGAr2wBM3+nYv3q362353aLs="; + + postInstall = '' + mv $out/bin/{cmd,pkgtop} + ''; + + meta = with lib; { + description = "Interactive package manager and resource monitor designed for the GNU/Linux"; + homepage = "https://github.com/orhun/pkgtop"; + changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6b3f42e377ef..a016fb08e3eb 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/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/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 8adb5a02f8c1..f51fcf254f98 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/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 \ @@ -158,6 +159,9 @@ buildPythonPackage rec { "test_sub_staged" "test_submodule_does_not_discard_changes" "test_submodule_does_not_discard_changes_recurse" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # requires gcc bump + "test_rust_hook" ]; pythonImportsCheck = [ diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f2a2adca4c7e..7bfa19a28558 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.7.2"; + version = "5.7.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo="; + sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + installManPage pspg.1 installShellCompletion --bash --cmd pspg bash-completion.sh ''; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index e21842e3604e..d5d86c198516 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/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/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 6ca75c64f56f..9a3c350b7977 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.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/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index fc30e71aaf5f..705cf9f90d70 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/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/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index b22d280d8a0a..e77dea2cc271 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/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/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index d0736761bada..05b008997b7f 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glew @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; + patches = [ + (fetchpatch { + # From Upstream PR#135: https://github.com/naelstrof/slop/pull/135 + name = "Fix-linking-of-GLEW-library.patch"; + url = "https://github.com/naelstrof/slop/commit/811b7e44648b9dd6c1da1554e70298cf4157e5fe.patch"; + sha256 = "sha256-LNUrAeVZUJFNOt1csOaIid7gLBdtqRxp8AcC7f3cnIQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 517aae1f7929..52fa4306ee3e 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.18.2"; + version = "0.18.6"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-n/5+IVhTaME4x0KFTueo4SSBkAvXgin1VJHNEe2JnPI="; + sha256 = "sha256-H/R+NXFaZ23vWN16/Ft5oP+Xvc97VY98cQth5+LtqnA="; }; vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 6b41e80ae9c2..bca16be194f1 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.60.0"; + version = "1.62.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-5/YAJl01ARralsBEV6ZJqcYfMMudCmcQcdQD1jn1I+M="; + hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU="; }; vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index aaaa297a5598..f3094302cd68 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "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/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix new file mode 100644 index 000000000000..5aca983252df --- /dev/null +++ b/pkgs/tools/misc/turbo/default.nix @@ -0,0 +1,91 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, git +, nodejs +, protobuf +, protoc-gen-go +, protoc-gen-go-grpc +, rustPlatform +, pkg-config +, openssl +, extra-cmake-modules +, fontconfig +, go +}: +let + version = "1.7.0"; + src = fetchFromGitHub { + owner = "vercel"; + repo = "turbo"; + rev = "v${version}"; + sha256 = "YTuEv2S3jNV2o7HJML+P6OMazgwgRhUPnd/zaTWfDWs="; + }; + + go-turbo = buildGoModule rec { + inherit src version; + pname = "go-turbo"; + modRoot = "cli"; + + vendorSha256 = "Kx/CLFv23h2TmGe8Jwu+S3QcONfqeHk2fCW1na75c0s="; + + nativeBuildInputs = [ + git + nodejs + protobuf + protoc-gen-go + protoc-gen-go-grpc + ]; + + preBuild = '' + make compile-protos + ''; + + preCheck = '' + # Some tests try to run mkdir $HOME + HOME=$TMP + + # Test_getTraversePath requires that source is a git repo + # pwd: /build/source/cli + pushd .. + git config --global init.defaultBranch main + git init + popd + ''; + + }; +in +rustPlatform.buildRustPackage rec { + pname = "turbo"; + inherit src version; + cargoBuildFlags = [ + "--package" + "turbo" + ]; + RELEASE_TURBO_CLI = "true"; + + cargoSha256 = "ENw6NU3Fedd+OJEEWgL8A54aowNqjn3iv7rxlr+/4ZE="; + RUSTC_BOOTSTRAP = 1; + nativeBuildInputs = [ + pkg-config + extra-cmake-modules + ]; + buildInputs = [ + openssl + fontconfig + ]; + + postInstall = '' + ln -s ${go-turbo}/bin/turbo $out/bin/go-turbo + ''; + + # Browser tests time out with chromium and google-chrome + doCheck = false; + + meta = with lib; { + description = "High-performance build system for JavaScript and TypeScript codebases"; + homepage = "https://turbo.build/"; + maintainers = with maintainers; [ dlip ]; + license = licenses.mpl20; + }; +} diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix index 204914c280c6..abe5c75f8b86 100644 --- a/pkgs/tools/misc/tvnamer/default.nix +++ b/pkgs/tools/misc/tvnamer/default.nix @@ -4,16 +4,20 @@ let python' = python3.override { - packageOverrides = self: super: rec { + packageOverrides = final: prev: rec { # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6 - requests-cache = super.requests-cache.overridePythonAttrs (super: rec { + requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec { version = "0.5.2"; - src = self.fetchPypi { - inherit (super) pname; + src = final.fetchPypi { + inherit (oldAttrs) pname; inherit version; sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs="; }; + nativeBuildInputs = with final; [ + setuptools + ]; + # too many changes have been made to requests-cache based on version 0.6 so # simply disable tests doCheck = false; diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/tools/misc/uair/default.nix index cdada5e4697f..90036a6b4576 100644 --- a/pkgs/tools/misc/uair/default.nix +++ b/pkgs/tools/misc/uair/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "uair"; - version = "v0.4.0"; + version = "v0.5.1"; src = fetchFromGitHub { owner = "metent"; repo = pname; rev = version; - hash = "sha256-xGPc371Dfo455rnfacXVDgC9SXU5s8jqw4ttSCBqWyk="; + hash = "sha256-qxfdKU3SFGVpp3OG0m+0qDvs5cB2bAaTF8+K6zwXRnI="; }; - cargoHash = "sha256-tHcMR8ExIlzYZzacBYyyk2d5by20jG4ihM0yU0K6Xhg="; + cargoHash = "sha256-XmEbXzpynkUPXywaf4wPcWq9zf3gNOHkcVr2jz3WNnc="; nativeBuildInputs = [ installShellFiles scdoc ]; diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/tools/misc/undocker/default.nix index 25f6b385ac5d..f80642f1e812 100644 --- a/pkgs/tools/misc/undocker/default.nix +++ b/pkgs/tools/misc/undocker/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "undocker"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromSourcehut { owner = "~motiejus"; repo = pname; rev = "v${version}"; - hash = "sha256-SmtM25sijcm5NF0ZrSqrRQDXiLMNp8WGAZX9yKvj1rQ="; + hash = "sha256-I+pTbr1lKELyYlyHrx2gB+aeZ3/PmcePQfXu1ckhKAk="; }; vendorHash = null; @@ -18,7 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://git.sr.ht/~motiejus/undocker"; description = "A CLI tool to convert a Docker image to a flattened rootfs tarball"; - license = licenses.mit; + license = licenses.asl20; maintainers = with maintainers; [ jordanisaacs ]; }; } diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 3a7d51f4c7c3..4d1783b53acc 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -2,15 +2,16 @@ let pname = "via"; - version = "2.0.5"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs="; + sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; profile = '' diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 93b451bedc8f..c3b5ae21f9f4 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8q"; + version = "0.9.8t"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-oY0zmyAgxMHPcBxFNdByQfeLIquw6eQ2SSfCgTKtO7Q="; + sha256 = "sha256-Q6kwGmxDThsaGIzSPhxd/kKz0nORf6K9lUJMU9CdIXU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 12c411f3ef43..267272b0b664 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - # Workaround '-idirafter' ordering bug in staging-next: - # https://github.com/NixOS/nixpkgs/pull/210004 - # where libc '-idirafter' gets added after user's idirafter and - # breaks. - # TODO(trofi): remove it in staging once fixed in cc-wrapper. - preConfigure = '' - export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) - ''; - buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' mkdir -p $out/share/wimboot/ cp wimboot.x86_64.efi $out/share/wimboot diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index f55926d0ae39..4ebaea963c29 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./config.h --replace \ "#include \"ascii/gnu.h\"" "#include \"ascii/nixos.h\"" + + sed '1i#include ' -i config.h # gcc12 ''; # Fixes installation path diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index f99632fac2de..d9331a8c28af 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -13,6 +13,7 @@ , ffmpegSupport ? true , rtmpSupport ? true , withAlias ? false # Provides bin/youtube-dl for backcompat +, update-python-libraries }: buildPythonPackage rec { @@ -20,11 +21,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.1.6"; + version = "2023.2.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ong6NnUc7RY2j0CzuoZas5swaJ7YBW8e4jRqo4OaCw8="; + sha256 = "sha256-mvkt5e/8GTvbUSFtnr8oh02WGA0gL651Kw2fKmM4Dzo="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; @@ -53,6 +54,8 @@ buildPythonPackage rec { ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; + passthru.updateScript = [ update-python-libraries (toString ./.) ]; + meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 60fc7c2ac709..a8a7dfd3ee68 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/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/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 730dfabe00f2..5487d9835cd5 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/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/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 5714a75e50e5..6e8c7669f0dd 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/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/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 87808b4a2233..5d8ab54b1624 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: let - version = "2022.12.7"; + version = "2023.1.2"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; + sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540"; }; name = "burpsuite-${version}"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 311e9e1b8c76..b91e7733ab23 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,7 @@ , phpExtensions , python3 , tests +, testers , fetchpatch }: @@ -178,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { # Additional checking with support http3 protocol. # nginx-http3 = useThisCurl nixosTests.nginx-http3; nginx-http3 = nixosTests.nginx-http3; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }; @@ -189,5 +191,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); + pkgConfigModules = [ "libcurl" ]; }; }) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index b0f03c093202..5457cf4ab53c 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.3"; + version = "2.1.4"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-5wfxjx8SxynY6DpPIvOLwSsBdM/0zSzfaVDQTI/RUD0="; + sha256 = "sha256-98DeCrDp0TmPCSvOrJ7KgIQZBR2K1fFJrmNccZ7nSug="; }; meta = with lib; { diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index 919469065c0b..f36fa1d2d98f 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/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/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 0b878a678e65..f4d6dcdb9965 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-V8wFswGs4p045mOyLA1Zrlz4JtfojHbUir0esS2iUIs="; + sha256 = "sha256-HLh+Z+ik7F52MBqQEMf1PuqTB32JOrpS8sHrqqln5kU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 5fb8fc33997b..a0ca8453ec92 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "sha256-J4zg5mAZ/xXKxBbEYYZRNjlbyUD/SDD/LSu43FrCbBE="; + sha256 = "sha256-x+ljh96RkmZQBPxUcXwcYQhRQAxMB8YOAsdg3aiht+U="; }; - cargoSha256 = "sha256-N0Rj6n8mQHZR4/4m1FHcqCKDqG7GeVxUs2XN0oxQVqQ="; + cargoHash = "sha256-GPa3gfqY3fiBI75+hLlqnR1+vUUWCxkracOdR6SsJFk="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 8e641ec83e73..5d0c92f2bfb5 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -60,7 +60,7 @@ in gcc9Stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook rpcsvc-proto ]; buildInputs = [ glib pcap libtirpc libnsl ]; - NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl -ltirpc"; + NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc"; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; postPatch = '' for patch in debian/patches/*.patch; do diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d711bc2726d4..6bf26bfb4d4c 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/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/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 4d6c54564bb2..030de9840fe3 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.46.1"; + version = "0.47.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; + sha256 = "sha256-S2qccDzS+Kj1tEAUR4a0G/4Eu3DAF7lY7ffxU6aykVU="; }; - vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; + vendorHash = "sha256-ffkXNE3LkgdCGfO6K9lGxEMxT/9Q1o0m3BMtu6tDHdk="; doCheck = false; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix new file mode 100644 index 000000000000..b68ff100b70b --- /dev/null +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, automake, cmake, autoconf, curl, numactl }: + +stdenv.mkDerivation rec { + pname = "grpc_cli"; + version = "1.46.6"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-UPenQh6+FBryQiOoeijsXkCZjlMzYljkg2aUtSFJFL4="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ automake cmake autoconf ]; + buildInputs = [ curl numactl ]; + cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; + makeFlags = [ "grpc_cli" ]; + installPhase = '' + runHook preInstall + + install -Dm555 grpc_cli "$out/bin/grpc_cli" + + runHook postInstall + ''; + meta = with lib; { + description = "The command line tool for interacting with grpc services."; + homepage = "https://github.com/grpc/grpc"; + license = licenses.asl20; + maintainers = with maintainers; [ doriath ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/tools/networking/haguichi/default.nix index 34ba1da28e4a..deb51191306d 100644 --- a/pkgs/tools/networking/haguichi/default.nix +++ b/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/pkgs/tools/networking/haguichi/update.sh b/pkgs/tools/networking/haguichi/update.sh new file mode 100755 index 000000000000..49a76a79d7ae --- /dev/null +++ b/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/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index bd8e6e6d31c7..94365191cdc3 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/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/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index c4c03cae3a7f..fabbbb40e7a7 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r"; }; + postPatch = '' + sed '1i#include ' -i src/dynports/dynports.cc # gcc12 + ''; + nativeBuildInputs = [ meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 0d6c2f617dd2..a05372a1577a 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/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/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 8bccb3afb26d..c2a9cf425245 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - sha256 = "sha256-BuKSIJGeHuHfzcaADgGqKyQ6oy5RAUHyRs8e+d/Nf+0="; + hash = "sha256-O/qiznQs+x7qBYXVItd0W7a0irEzRf0We7kW7HHLqcw="; }; postConfigure = '' @@ -24,7 +24,7 @@ buildGoModule rec { 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/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 4f312d0e6ad0..47f106e5f2a7 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/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/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index dcedbb1409c5..2702c740dda2 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/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.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-T8dPM90X4soVG/plKsf7DM9XgdX5Vcp0i6zTE60gbq0="; + hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk="; }; - 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-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-6qyMARhPPgTryEtaBNrIPN9ja/fe7Fyx38iGuTd+Dk8="; + hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0="; }; vpngleanDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}-vpnglean"; preBuild = "cd vpnglean"; - hash = "sha256-8OLTQmRvy6pATEBX2za6f9vMEqwkf9L5VyERtAN2BDQ="; + hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI="; }; 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/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index 713a4eef55da..e3d51912c702 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.13.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-FfqldK2iDB4Cy5M1uMUDEikV8JMMBzh2kgmvtZiJTOc="; + hash = "sha256-EIglOoHL1ZmkFUn2MTU+ISQmaX96kCxelwk5ylHlMHk="; }; - vendorHash = "sha256-5YqourXzrRdfmWdHE/ZsRTze2h02ZHAsprQrSTZFrhY="; + vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix new file mode 100644 index 000000000000..71c32ae7ad7d --- /dev/null +++ b/pkgs/tools/networking/muffet/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "muffet"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "raviqqe"; + repo = "muffet"; + rev = "v${version}"; + hash = "sha256-Kk0HRs4mzpEI9URFIegAVWejBZLGWW08vdsjw9ZHLxU="; + }; + + vendorHash = "sha256-auTDSL3J+LuW6M5LRAWJCvL1xAiyqluPt6EQpFztYpA="; + + meta = with lib; { + description = "A website link checker which scrapes and inspects all pages in a website recursively"; + homepage = "https://github.com/raviqqe/muffet"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/tools/networking/n2n/default.nix index 77c7d4161d1f..08028910f82a 100644 --- a/pkgs/tools/networking/n2n/default.nix +++ b/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/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 05804ab29c00..425ddb440435 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -12,25 +12,25 @@ stdenv.mkDerivation rec { pname = "ndn-tools"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = pname; rev = "ndn-tools-${version}"; - sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; + sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8="; }; nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail because of the sandbox environment checkPhase = '' runHook preCheck build/unit-tests diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 521c8ff2f20c..6f4483cd7283 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/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/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c1becc886a59..4301f606a402 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc="; + sha256 = "sha256-Afj2pllGPL86hhSNDSbvO+GkA62CI8V5dnUa0mjEMCg="; }; vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q="; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f7e98b2b92fd..1ade86eb5d08 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; version = "1.4.0"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 8c8d0dd6a322..8d09977b4e57 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -5,7 +5,7 @@ let pname = "NetworkManager-iodine"; version = "unstable-2019-11-05"; in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 11a414a8a6a0..cef05f116106 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -20,7 +20,7 @@ }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; version = "1.20.4"; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 6b05dcdcd854..3e4fbb36513b 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; version = "1.3.1"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 339b2aecbaa5..69ab1b35c141 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/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/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 146a2fc6ea50..e35c8d71cce9 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -15,7 +15,7 @@ , zlib , vpnc-scripts , PCSC -, useDefaultExternalBrowser ? true +, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile , xdg-utils , autoreconfHook }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC ++ lib.optional stdenv.isLinux p11-kit - ++ lib.optional (stdenv.isLinux && useDefaultExternalBrowser) xdg-utils; + ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f9ad037d55da..b7e1e879b060 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "9.1p1"; + version = "9.2p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -37,6 +37,13 @@ in stripLen = 1; sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; }) + + (fetchpatch { + name = "CVE-2023-25136.patch"; + url = "https://ftp.openbsd.org/pub/OpenBSD/patches/7.2/common/017_sshd.patch.sig"; + stripLen = 1; + hash = "sha256-ol/YXXb2gJNBfvg9JKmIEdwGK8RaDfW53aKKT6HU++M="; + }) ]; extraNativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix index 87b20daf9795..ca33e4862478 100644 --- a/pkgs/tools/networking/pingu/default.nix +++ b/pkgs/tools/networking/pingu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pingu"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitHub { owner = "sheepla"; repo = "pingu"; rev = "v${version}"; - sha256 = "sha256-KYCG3L5x0ZdcyseffB0GoKpLZ/VG/qjMDh10qrLn62Y="; + sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE="; }; - vendorSha256 = "sha256-HkESF/aADGPixOeh+osFnjzhpz+/4NIsJOjpyyFF9Eg="; + vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU="; meta = with lib; { description = "Ping command implementation in Go but with colorful output and pingu ascii art"; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index be50397bf1d0..4238391fdaea 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -53,6 +53,14 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lcrypt"; + # This can probably be removed if version > 2.4.9, as IPX support + # has been removed upstream[1]. Just check whether pkgsMusl.ppp + # still builds. + # + # [1]: https://github.com/ppp-project/ppp/commit/c2881a6b71a36d28a89166e82820dc5e711fd775 + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.hostPlatform.isMusl "-UIPX_CHANGE"; + installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 0764c274084a..a5ecaa79e905 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/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/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f58fd9a998b1..2ac9931f2ca5 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/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/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 999d30bd9293..908166bb1542 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-7iwRbik3hUj6Zv3tqLKqhGUIag6OnWRhpWqW6NTI+FU="; + sha256 = "sha256-r2NRIb6qbA1B5HlVNRqa9ongQpyiyPskhembPHX3Lgc="; }; - vendorHash = "sha256-wHLYVf8QurMbmdLNkTFGgmncOJlJHZF8PwYTUniXOGY="; + vendorHash = "sha256-dnfm4KiVD89bnHV7bfw5aXWHGdcH9JBdrtvuS6s8N5w="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index 766c9a095021..f7118b695046 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/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/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index 8b0c987059ef..ba8b46d486b6 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/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/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 73ccdb43fef8..9ccf68aa5437 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.1"; + version = "4.99.3"; src = fetchurl { - url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; + url = "http://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; + sha256 = "sha256-rXWm7T3A2XMpRbLlSDy0Hci0tSihaTFeSZxoYZUuc7M="; }; postPatch = '' @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - configureFlags = lib.optional - (stdenv.hostPlatform != stdenv.buildPlatform) - "ac_cv_linux_vers=2"; + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "ac_cv_linux_vers=2"; meta = with lib; { description = "Network sniffer"; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 3d67bbb07932..bf2587d8c658 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { "SD_NOTIFY=1" ]; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 4b283a5eccd8..71e5dea12be6 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyfecvpn"; - version = "20210116.0"; + version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = pname; rev = version; - sha256 = "sha256-Ng5AZJfrnNXSSbhJKBc+giNp2yOWta0EozWHB7lFUmw="; + sha256 = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/tools/networking/udp2raw/default.nix index fdb95b121f2d..1bb063925236 100644 --- a/pkgs/tools/networking/udp2raw/default.nix +++ b/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/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 17a55d86b9a3..067bc51854ad 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ libubox json_c ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=dangling-pointer" + ]; + meta = with lib; { description = "Tiny QMI command line utility"; homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary"; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index b0cca0985b6f..cad8c032271b 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-Q7yro9jHNr+HSJkoO7D+T05+AK26eLtw9NfvDTWeMw8="; + hash = "sha256-LLvAoPA3rLGfhrWD37OVyWd4tC9mwgpE1WjK2pY27xU="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-uXxqqPNSa2s1KmBPzvYVdTmOLxaWer9+AupdvL3+qYU="; + vendorSha256 = "sha256-xBNVyPN9PRkraPRzZXOguGemYPm+Jw8hl04vWV8TZaA="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index b0bc3346526c..6d19aea8040d 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -7,6 +7,7 @@ , makeWrapper , openresolv , procps +, bash }: stdenv.mkDerivation rec { @@ -24,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" diff --git a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff new file mode 100644 index 000000000000..b94ca03bb317 --- /dev/null +++ b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff @@ -0,0 +1,29 @@ +diff -Naur source-old/pyproject.toml source-new/pyproject.toml +--- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300 ++++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300 +@@ -29,11 +29,11 @@ + "Topic :: Security", + ] + dependencies = [ +- "pydantic~=1.10.2", +- "python-dotenv~=0.21.0", +- "requests~=2.28.1", +- "rich~=12.6.0", +- "shodan~=1.28.0", ++ "pydantic", ++ "python-dotenv", ++ "requests", ++ "rich", ++ "shodan", + ] + dynamic = ["version"] + +@@ -63,7 +63,7 @@ + "mypy", + "pytest", + "pytest-cov", +- "types-requests~=2.28.1", ++ "types-requests", + ] + [tool.hatch.envs.default.scripts] + typecheck = "mypy -p {args:wtfis}" diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix new file mode 100644 index 000000000000..30c2eda8eda0 --- /dev/null +++ b/pkgs/tools/networking/wtfis/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +let + pname = "wtfis"; + version = "0.5.1"; +in python3.pkgs.buildPythonApplication { + inherit pname version; + + src = fetchFromGitHub { + owner = "pirxthepilot"; + repo = "wtfis"; + rev = "v${version}"; + hash = "sha256-XoQ/iJTdZoekA5guxI8POG4NEhN8Up3OuIz344G75ao="; + }; + + patches = [ + # TODO: get rid of that newbie patch + ./000-pyproject-remove-versions.diff + ]; + + format = "pyproject"; + + propagatedBuildInputs = [ + python3.pkgs.hatchling + python3.pkgs.pydantic + python3.pkgs.rich + python3.pkgs.shodan + python3.pkgs.python-dotenv + ]; + + meta = { + homepage = "https://github.com/pirxthepilot/wtfis"; + description = "Passive hostname, domain and IP lookup tool for non-robots"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e59715e61f38..f250d6de13f2 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.7.2"; + version = "1.7.5"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "sha256-jwCvo6+YXC471VqGWzcrnrLWOSJW2tBKa5SoynQg0Lo="; + sha256 = "sha256-WCku/7eczcsGiIuTy0sSQKUKXlH14TpdVg2/ZPdaiHQ="; }; - vendorSha256 = "sha256-P2g0MqlBScm6yTnpvL5T6l9ntsb4tK9k3Civ7rTevrE="; + vendorSha256 = "sha256-2P7fI7fUnShsAl95mPiJgtr/eobt+DMmaoxZcox0eu8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 1320387a217e..586e726b3d4a 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI="; + hash = "sha256-2zVCOcjL8TUbo38Dx7W8431ziouzuAdCfogsIMSOOmQ="; }; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 151a53f15258..84bd3e891622 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { path = lib.makeBinPath ([ coreutils findutils gnugrep - ] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else [])); + ] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ])); is_darwin = if stdenv.isDarwin then "yes" else "no"; sandboxtest = ./sandbox.nix; diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 473830097a46..c60f88022ccc 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/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/pkgs/tools/nix/nix-init/license.nix b/pkgs/tools/nix/nix-init/license.nix index 28e798645dad..0a1ad4fce122 100644 --- a/pkgs/tools/nix/nix-init/license.nix +++ b/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/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix index 55bbbd9ffa56..312bc8058245 100644 --- a/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/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/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py index 67d7bce0047d..1c58accb4166 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -10,6 +10,7 @@ from typing import Any, Dict from .md import Converter from . import manual from . import options +from . import parallel def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: print(f"\x1b[1;31m{_desc_text}:\x1b[0m", file=sys.stderr) @@ -29,12 +30,13 @@ def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: print(textwrap.indent(extra_info, "\t"), file=sys.stderr, end="") else: print(e) - if e.__context__ is not None: + if e.__cause__ is not None: print("", file=sys.stderr) - pretty_print_exc(e.__context__, _desc_text="caused by") + pretty_print_exc(e.__cause__, _desc_text="caused by") def main() -> None: parser = argparse.ArgumentParser(description='render nixos manual bits') + parser.add_argument('-j', '--jobs', type=int, default=None) commands = parser.add_subparsers(dest='command', required=True) @@ -43,6 +45,7 @@ def main() -> None: args = parser.parse_args() try: + parallel.pool_processes = args.jobs if args.command == 'options': options.run_cli(args) elif args.command == 'manual': diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py index bad36e57a2f3..28ab53720936 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -28,18 +28,23 @@ class Deflist: class Heading(NamedTuple): container_tag: str level: int + # special handling for titles: whether partinfo was already closed from elsewhere + # or still needs closing. + partintro_closed: bool = False class DocBookRenderer(Renderer): __output__ = "docbook" _link_tags: list[str] _deflists: list[Deflist] _headings: list[Heading] + _attrspans: list[str] def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): super().__init__(manpage_urls, parser) self._link_tags = [] self._deflists = [] self._headings = [] + self._attrspans = [] def render(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping[str, Any]) -> str: @@ -103,7 +108,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: @@ -212,13 +217,29 @@ class DocBookRenderer(Renderer): else: return ref 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 f'' + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # we currently support *only* inline anchors and the special .keycap class to produce + # docbook elements. + (id_part, class_part) = ("", "") + if s := token.attrs.get('id'): + id_part = f'' + if s := token.attrs.get('class'): + if s == 'keycap': + class_part = "" + self._attrspans.append("") + else: + return super().attr_span_begin(token, tokens, i, options, env) + else: + self._attrspans.append("") + return id_part + class_part + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._attrspans.pop() 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: @@ -233,15 +254,35 @@ class DocBookRenderer(Renderer): return result + f'<{tag}{attrs_str}>\n' def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: - return '' + heading = self._headings[-1] + result = '' + if heading.container_tag == 'part': + # generate the same ids as were previously assigned manually. if this collides we + # rely on outside schema validation to catch it! + maybe_id = "" + assert tokens[i - 2].type == 'heading_open' + if id := cast(str, tokens[i - 2].attrs.get('id', "")): + maybe_id = " xml:id=" + quoteattr(id + "-intro") + result += f"" + return result + def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if id := token.attrs.get('id'): + return f"" + return "" + def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" def _close_headings(self, level: Optional[int], env: MutableMapping[str, Any]) -> str: # we rely on markdown-it producing h{1..6} tags in token.tag for this to work result = [] while len(self._headings): if level is None or self._headings[-1].level >= level: - result.append(f"") - self._headings.pop() + heading = self._headings.pop() + if heading.container_tag == 'part' and not heading.partintro_closed: + result.append("") + result.append(f"") else: break return "\n".join(result) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py new file mode 100644 index 000000000000..1b796d9f0486 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py @@ -0,0 +1,336 @@ +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 attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # mdoc knows no anchors so we can drop those, but classes must be rejected. + if 'class' in token.attrs: + return super().attr_span_begin(token, tokens, i, options, env) + return "" + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + 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/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py index 8c2d41457539..efc8b02e8d6b 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -2,68 +2,107 @@ import argparse import json from abc import abstractmethod -from collections.abc import MutableMapping, Sequence +from collections.abc import Mapping, MutableMapping, Sequence from pathlib import Path from typing import Any, cast, NamedTuple, Optional, Union from xml.sax.saxutils import escape, quoteattr + +import markdown_it from markdown_it.token import Token from markdown_it.utils import OptionsDict -from .docbook import DocBookRenderer +from . import options +from .docbook import DocBookRenderer, Heading from .md import Converter -class RenderedSection: - id: Optional[str] - chapters: list[str] - - def __init__(self, id: Optional[str]) -> None: - self.id = id - self.chapters = [] - -class BaseConverter(Converter): - _sections: list[RenderedSection] - - def __init__(self, manpage_urls: dict[str, str]): - super().__init__(manpage_urls) - self._sections = [] - - def add_section(self, id: Optional[str], chapters: list[Path]) -> None: - self._sections.append(RenderedSection(id)) - 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() - class ManualDocBookRenderer(DocBookRenderer): - # needed to check correctness of chapters. - # we may want to use front matter instead of this kind of heuristic. - _title_seen = False + _toplevel_tag: str + + def __init__(self, toplevel_tag: str, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._toplevel_tag = toplevel_tag + self.rules |= { + 'included_sections': lambda *args: self._included_thing("section", *args), + 'included_chapters': lambda *args: self._included_thing("chapter", *args), + 'included_preface': lambda *args: self._included_thing("preface", *args), + 'included_parts': lambda *args: self._included_thing("part", *args), + 'included_appendix': lambda *args: self._included_thing("appendix", *args), + 'included_options': self.included_options, + } + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + wanted = { 'h1': 'title' } + wanted |= { 'h2': 'subtitle' } if self._toplevel_tag == 'book' else {} + for (i, (tag, kind)) in enumerate(wanted.items()): + if len(tokens) < 3 * (i + 1): + raise RuntimeError(f"missing {kind} ({tag}) heading") + token = tokens[3 * i] + if token.type != 'heading_open' or token.tag != tag: + assert token.map + raise RuntimeError(f"expected {kind} ({tag}) heading in line {token.map[0] + 1}", token) + for t in tokens[3 * len(wanted):]: + if t.type != 'heading_open' or (info := wanted.get(t.tag)) is None: + continue + assert t.map + raise RuntimeError( + f"only one {info[0]} heading ({t.markup} [text...]) allowed per " + f"{self._toplevel_tag}, but found a second in lines [{t.map[0] + 1}..{t.map[1]}]. " + "please remove all such headings except the first or demote the subsequent headings.", + t) + + # books get special handling because they have *two* title tags. doing this with + # generic code is more complicated than it's worth. the checks above have verified + # that both titles actually exist. + if self._toplevel_tag == 'book': + assert tokens[1].children + assert tokens[4].children + if (maybe_id := cast(str, tokens[0].attrs.get('id', ""))): + maybe_id = "xml:id=" + quoteattr(maybe_id) + return (f'' + f' {self.renderInline(tokens[1].children, options, env)}' + f' {self.renderInline(tokens[4].children, options, env)}' + f' {super().render(tokens[6:], options, env)}' + f'') + + return super().render(tokens, options, env) def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: (tag, attrs) = super()._heading_tag(token, tokens, i, options, env) - if self._title_seen: - if token.tag == 'h1': - 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) + # render() has already verified that we don't have supernumerary headings and since the + # book tag is handled specially we can leave the check this simple + if token.tag != 'h1': return (tag, attrs) - self._title_seen = True - return ("chapter", attrs | { + return (self._toplevel_tag, attrs | { 'xmlns': "http://docbook.org/ns/docbook", 'xmlns:xlink': "http://www.w3.org/1999/xlink", }) + def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int, + options: OptionsDict, env: MutableMapping[str, Any]) -> str: + result = [] + # close existing partintro. the generic render doesn't really need this because + # it doesn't have a concept of structure in the way the manual does. + if self._headings and self._headings[-1] == Heading('part', 1): + result.append("") + self._headings[-1] = self._headings[-1]._replace(partintro_closed=True) + # must nest properly for structural includes. this requires saving at least + # the headings stack, but creating new renderers is cheap and much easier. + r = ManualDocBookRenderer(tag, self._manpage_urls, None) + for (included, path) in token.meta['included']: + try: + result.append(r.render(included, options, env)) + except Exception as e: + raise RuntimeError(f"rendering {path}") from e + return "".join(result) + def included_options(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return cast(str, token.meta['rendered-options']) + # TODO minimize docbook diffs with existing conversions. remove soon. def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: @@ -79,65 +118,103 @@ class ManualDocBookRenderer(DocBookRenderer): info = f" language={quoteattr(token.info)}" if token.info != "" else "" return f"\n{escape(token.content)}" -class DocBookConverter(BaseConverter): - __renderer__ = ManualDocBookRenderer +class DocBookConverter(Converter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt]) -> ManualDocBookRenderer: + return ManualDocBookRenderer('book', manpage_urls, parser) - def finalize(self) -> str: - result = [] + _base_paths: list[Path] + _revision: str - for section in self._sections: - id = "id=" + quoteattr(section.id) if section.id is not None else "" - result.append(f'
') - result += section.chapters - result.append(f'
') + def __init__(self, manpage_urls: Mapping[str, str], revision: str): + super().__init__(manpage_urls) + self._revision = revision - return "\n".join(result) + def convert(self, file: Path) -> str: + self._base_paths = [ file ] + try: + with open(file, 'r') as f: + return self._render(f.read()) + except Exception as e: + raise RuntimeError(f"failed to render manual {file}") from e + + def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: + tokens = super()._parse(src, env) + for token in tokens: + if token.type != "fence" or not token.info.startswith("{=include=} "): + continue + typ = token.info[12:].strip() + if typ == 'options': + token.type = 'included_options' + self._parse_options(token) + elif typ in [ 'sections', 'chapters', 'preface', 'parts', 'appendix' ]: + token.type = 'included_' + typ + self._parse_included_blocks(token, env) + else: + raise RuntimeError(f"unsupported structural include type '{typ}'") + return tokens + + def _parse_included_blocks(self, token: Token, env: Optional[MutableMapping[str, Any]]) -> None: + assert token.map + included = token.meta['included'] = [] + for (lnum, line) in enumerate(token.content.splitlines(), token.map[0] + 2): + line = line.strip() + path = self._base_paths[-1].parent / line + if path in self._base_paths: + raise RuntimeError(f"circular include found in line {lnum}") + try: + self._base_paths.append(path) + with open(path, 'r') as f: + tokens = self._parse(f.read(), env) + included.append((tokens, path)) + self._base_paths.pop() + except Exception as e: + raise RuntimeError(f"processing included file {path} from line {lnum}") from e + + def _parse_options(self, token: Token) -> None: + assert token.map + + items = {} + for (lnum, line) in enumerate(token.content.splitlines(), token.map[0] + 2): + if len(args := line.split(":", 1)) != 2: + raise RuntimeError(f"options directive with no argument in line {lnum}") + (k, v) = (args[0].strip(), args[1].strip()) + if k in items: + raise RuntimeError(f"duplicate options directive {k} in line {lnum}") + items[k] = v + try: + id_prefix = items.pop('id-prefix') + varlist_id = items.pop('list-id') + source = items.pop('source') + except KeyError as e: + raise RuntimeError(f"options directive {e} missing in block at line {token.map[0] + 1}") + if items.keys(): + raise RuntimeError( + f"unsupported options directives in block at line {token.map[0] + 1}", + " ".join(items.keys())) + + try: + conv = options.DocBookConverter( + self._manpage_urls, self._revision, False, 'fragment', varlist_id, id_prefix) + with open(self._base_paths[-1].parent / source, 'r') as f: + conv.add_options(json.load(f)) + token.meta['rendered-options'] = conv.finalize(fragment=True) + except Exception as e: + raise RuntimeError(f"processing options block in line {token.map[0] + 1}") from e -class Section: - id: Optional[str] = None - chapters: list[str] - - def __init__(self) -> None: - self.chapters = [] - -class SectionAction(argparse.Action): - def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, - values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: - sections = getattr(ns, self.dest) - if sections is None: sections = [] - sections.append(Section()) - setattr(ns, self.dest, sections) - -class SectionIDAction(argparse.Action): - def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, - 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].id = cast(str, values) - -class ChaptersAction(argparse.Action): - def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, - 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(map(Path, cast(Sequence[str], values))) - def _build_cli_db(p: argparse.ArgumentParser) -> None: p.add_argument('--manpage-urls', required=True) - p.add_argument("outfile") - p.add_argument("--section", dest="contents", action=SectionAction, nargs=0) - p.add_argument("--section-id", dest="contents", action=SectionIDAction) - p.add_argument("--chapters", dest="contents", action=ChaptersAction, nargs='+') + p.add_argument('--revision', required=True) + p.add_argument('infile', type=Path) + p.add_argument('outfile', type=Path) 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: - md.add_section(section.id, section.chapters) - with open(args.outfile, 'w') as f: - f.write(md.finalize()) + md = DocBookConverter(json.load(manpage_urls), args.revision) + converted = md.convert(args.infile) + args.outfile.write_text(converted) def build_cli(p: argparse.ArgumentParser) -> None: formats = p.add_subparsers(dest='format', required=True) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py index c08675870f6a..599ee7e91c14 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -1,8 +1,9 @@ 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, get_args, Iterable, Literal, NoReturn, Optional +import dataclasses import re from .types import RenderFn @@ -27,9 +28,13 @@ _md_escape_table = { def md_escape(s: str) -> str: return s.translate(_md_escape_table) +AttrBlockKind = Literal['admonition', 'example'] + +AdmonitionKind = Literal["note", "caution", "tip", "important", "warning"] + class Renderer(markdown_it.renderer.RendererProtocol): - _admonitions: dict[str, tuple[RenderFn, RenderFn]] - _admonition_stack: list[str] + _admonitions: dict[AdmonitionKind, tuple[RenderFn, RenderFn]] + _admonition_stack: list[AdmonitionKind] def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): self._manpage_urls = manpage_urls @@ -61,27 +66,35 @@ class Renderer(markdown_it.renderer.RendererProtocol): 'dd_open': self.dd_open, 'dd_close': self.dd_close, 'myst_role': self.myst_role, - "container_admonition_open": self.admonition_open, - "container_admonition_close": self.admonition_close, - "inline_anchor": self.inline_anchor, + "admonition_open": self.admonition_open, + "admonition_close": self.admonition_close, + "attr_span_begin": self.attr_span_begin, + "attr_span_end": self.attr_span_end, "heading_open": self.heading_open, "heading_close": self.heading_close, "ordered_list_open": self.ordered_list_open, "ordered_list_close": self.ordered_list_close, + "example_open": self.example_open, + "example_close": self.example_close, } self._admonitions = { - "{.note}": (self.note_open, self.note_close), - "{.caution}": (self.caution_open,self.caution_close), - "{.tip}": (self.tip_open, self.tip_close), - "{.important}": (self.important_open, self.important_close), - "{.warning}": (self.warning_open, self.warning_close), + "note": (self.note_open, self.note_close), + "caution": (self.caution_open,self.caution_close), + "tip": (self.tip_open, self.tip_close), + "important": (self.important_open, self.important_close), + "warning": (self.warning_open, self.warning_close), } 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() + tag = token.meta['kind'] self._admonition_stack.append(tag) return self._admonitions[tag][0](token, tokens, i, options, env) def admonition_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, @@ -98,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_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 +119,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: @@ -219,7 +232,10 @@ class Renderer(markdown_it.renderer.RendererProtocol): def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: raise RuntimeError("md token not supported", token) - def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: raise RuntimeError("md token not supported", token) def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, @@ -234,6 +250,12 @@ class Renderer(markdown_it.renderer.RendererProtocol): def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, env: MutableMapping[str, Any]) -> str: raise RuntimeError("md token not supported", token) + def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) def _is_escaped(src: str, pos: int) -> bool: found = 0 @@ -242,10 +264,44 @@ def _is_escaped(src: str, pos: int) -> bool: pos -= 1 return found % 2 == 1 -_INLINE_ANCHOR_PATTERN = re.compile(r"\{\s*#([\w-]+)\s*\}") +# the contents won't be split apart in the regex because spacing rules get messy here +_ATTR_SPAN_PATTERN = re.compile(r"\{([^}]*)\}") +# this one is for blocks with attrs. we want to use it with fullmatch() to deconstruct an info. +_ATTR_BLOCK_PATTERN = re.compile(r"\s*\{([^}]*)\}\s*") -def _inline_anchor_plugin(md: markdown_it.MarkdownIt) -> None: - def inline_anchor(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: +def _parse_attrs(s: str) -> Optional[tuple[Optional[str], list[str]]]: + (id, classes) = (None, []) + for part in s.split(): + if part.startswith('#'): + if id is not None: + return None # just bail on multiple ids instead of trying to recover + id = part[1:] + elif part.startswith('.'): + classes.append(part[1:]) + else: + return None # no support for key=value attrs like in pandoc + + return (id, classes) + +def _parse_blockattrs(info: str) -> Optional[tuple[AttrBlockKind, Optional[str], list[str]]]: + if (m := _ATTR_BLOCK_PATTERN.fullmatch(info)) is None: + return None + if (parsed_attrs := _parse_attrs(m[1])) is None: + return None + id, classes = parsed_attrs + # check that we actually support this kind of block, and that is adheres to + # whetever restrictions we want to enforce for that kind of block. + if len(classes) == 1 and classes[0] in get_args(AdmonitionKind): + # don't want to support ids for admonitions just yet + if id is not None: + return None + return ('admonition', id, classes) + if classes == ['example']: + return ('example', id, classes) + return None + +def _attr_span_plugin(md: markdown_it.MarkdownIt) -> None: + def attr_span(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: if state.src[state.pos] != '[': return False if _is_escaped(state.src, state.pos - 1): @@ -258,24 +314,33 @@ def _inline_anchor_plugin(md: markdown_it.MarkdownIt) -> None: if label_end < 0: return False - # match id - match = _INLINE_ANCHOR_PATTERN.match(state.src[label_end + 1 : ]) + # match id and classes in any combination + match = _ATTR_SPAN_PATTERN.match(state.src[label_end + 1 : ]) if not match: return False if not silent: - token = state.push("inline_anchor", "", 0) # type: ignore[no-untyped-call] - token.attrs['id'] = match[1] + if (parsed_attrs := _parse_attrs(match[1])) is None: + return False + id, classes = parsed_attrs + + token = state.push("attr_span_begin", "span", 1) # type: ignore[no-untyped-call] + if id: + token.attrs['id'] = id + if classes: + token.attrs['class'] = " ".join(classes) state.pos = label_begin state.posMax = label_end state.md.inline.tokenize(state) + state.push("attr_span_end", "span", -1) # type: ignore[no-untyped-call] + state.pos = label_end + match.end() + 1 state.posMax = input_end return True - md.inline.ruler.before("link", "inline_anchor", inline_anchor) + md.inline.ruler.before("link", "attr_span", attr_span) def _inline_comment_plugin(md: markdown_it.MarkdownIt) -> None: def inline_comment(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: @@ -316,7 +381,78 @@ def _block_comment_plugin(md: markdown_it.MarkdownIt) -> None: md.block.ruler.after("code", "block_comment", block_comment) -_HEADER_ID_RE = re.compile(r"\s*\{\s*\#([\w-]+)\s*\}\s*$") +_HEADER_ID_RE = re.compile(r"\s*\{\s*\#([\w.-]+)\s*\}\s*$") + +def _heading_ids(md: markdown_it.MarkdownIt) -> None: + def heading_ids(state: markdown_it.rules_core.StateCore) -> None: + tokens = state.tokens + # this is purposely simple and doesn't support classes or other kinds of attributes. + for (i, token) in enumerate(tokens): + if token.type == 'heading_open': + children = tokens[i + 1].children + assert children is not None + if len(children) == 0 or children[-1].type != 'text': + continue + if m := _HEADER_ID_RE.search(children[-1].content): + tokens[i].attrs['id'] = m[1] + children[-1].content = children[-1].content[:-len(m[0])].rstrip() + + md.core.ruler.before("replacements", "heading_ids", heading_ids) + +def _compact_list_attr(md: markdown_it.MarkdownIt) -> None: + @dataclasses.dataclass + class Entry: + head: Token + end: int + compact: bool = True + + def compact_list_attr(state: markdown_it.rules_core.StateCore) -> None: + # markdown-it signifies wide lists by setting the wrapper paragraphs + # of each item to hidden. this is not useful for our stylesheets, which + # signify this with a special css class on list elements instead. + stack = [] + for token in state.tokens: + if token.type in [ 'bullet_list_open', 'ordered_list_open' ]: + stack.append(Entry(token, cast(int, token.attrs.get('start', 1)))) + elif token.type in [ 'bullet_list_close', 'ordered_list_close' ]: + lst = stack.pop() + lst.head.meta['compact'] = lst.compact + if token.type == 'ordered_list_close': + lst.head.meta['end'] = lst.end - 1 + elif len(stack) > 0 and token.type == 'paragraph_open' and not token.hidden: + stack[-1].compact = False + elif token.type == 'list_item_open': + stack[-1].end += 1 + + md.core.ruler.push("compact_list_attr", compact_list_attr) + +def _block_attr(md: markdown_it.MarkdownIt) -> None: + def assert_never(value: NoReturn) -> NoReturn: + assert False + + def block_attr(state: markdown_it.rules_core.StateCore) -> None: + stack = [] + for token in state.tokens: + if token.type == 'container_blockattr_open': + if (parsed_attrs := _parse_blockattrs(token.info)) is None: + # if we get here we've missed a possible case in the plugin validate function + raise RuntimeError("this should be unreachable") + kind, id, classes = parsed_attrs + if kind == 'admonition': + token.type = 'admonition_open' + token.meta['kind'] = classes[0] + stack.append('admonition_close') + elif kind == 'example': + token.type = 'example_open' + if id is not None: + token.attrs['id'] = id + stack.append('example_close') + else: + assert_never(kind) + elif token.type == 'container_blockattr_close': + token.type = stack.pop() + + md.core.ruler.push("block_attr", block_attr) class Converter(ABC): __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] @@ -335,51 +471,23 @@ class Converter(ABC): ) self._md.use( container_plugin, - name="admonition", - validate=lambda name, *args: ( - name.strip() in self._md.renderer._admonitions # type: ignore[attr-defined] - ) + name="blockattr", + validate=lambda name, *args: _parse_blockattrs(name), ) self._md.use(deflist_plugin) self._md.use(myst_role_plugin) - self._md.use(_inline_anchor_plugin) + self._md.use(_attr_span_plugin) self._md.use(_inline_comment_plugin) self._md.use(_block_comment_plugin) + self._md.use(_heading_ids) + self._md.use(_compact_list_attr) + self._md.use(_block_attr) self._md.enable(["smartquotes", "replacements"]) - def _post_parse(self, tokens: list[Token]) -> list[Token]: - for i in range(0, len(tokens)): - # parse header IDs. this is purposely simple and doesn't support - # classes or other inds of attributes. - if tokens[i].type == 'heading_open': - children = tokens[i + 1].children - assert children is not None - if len(children) == 0 or children[-1].type != 'text': - continue - if m := _HEADER_ID_RE.search(children[-1].content): - tokens[i].attrs['id'] = m[1] - children[-1].content = children[-1].content[:-len(m[0])].rstrip() - - # markdown-it signifies wide lists by setting the wrapper paragraphs - # 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 = [] - for i in range(0, len(tokens)): - if tokens[i].type in [ 'bullet_list_open', 'ordered_list_open' ]: - wide_stack.append([i, True]) - elif tokens[i].type in [ 'bullet_list_close', 'ordered_list_close' ]: - (idx, compact) = wide_stack.pop() - tokens[idx].attrs['compact'] = compact - elif len(wide_stack) > 0 and tokens[i].type == 'paragraph_open' and not tokens[i].hidden: - wide_stack[-1][1] = False - - return tokens - def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: - tokens = self._md.parse(src, env if env is not None else {}) - return self._post_parse(tokens) + return self._md.parse(src, env if env is not None else {}) - 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/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py index 3667c7bbcdeb..8282d7493249 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -1,14 +1,20 @@ +from __future__ import annotations + 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 . import parallel 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 +28,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], + def __init__(self, manpage_urls: Mapping[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 +115,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 +125,59 @@ 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 ] + + # this could return a TState parameter, but that does not allow dependent types and + # will cause headaches when using BaseConverter as a type bound anywhere. Any is the + # next best thing we can use, and since this is internal it will be mostly safe. + @abstractmethod + def _parallel_render_prepare(self) -> Any: raise NotImplementedError() + # this should return python 3.11's Self instead to ensure that a prepare+finish + # round-trip ends up with an object of the same type. for now we'll use BaseConverter + # since it's good enough so far. + @classmethod + @abstractmethod + def _parallel_render_init_worker(cls, a: Any) -> BaseConverter: raise NotImplementedError() + + 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 + + @classmethod + def _parallel_render_step(cls, s: BaseConverter, a: Any) -> RenderedOption: + return s._render_option(*a) 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 + mapped = parallel.map(self._parallel_render_step, options.items(), 100, + self._parallel_render_init_worker, self._parallel_render_prepare()) + for (name, option) in zip(options.keys(), mapped): + self._options[name] = option @abstractmethod def finalize(self) -> str: raise NotImplementedError() @@ -159,15 +193,34 @@ 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 _parallel_render_prepare(self) -> Any: + return (self._manpage_urls, self._revision, self._markdown_by_default, self._document_type, + self._varlist_id, self._id_prefix) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> DocBookConverter: + return cls(*a) def _render_code(self, option: dict[str, Any], key: str) -> list[str]: if lit := option_is(option, key, 'literalDocBook'): @@ -206,14 +259,11 @@ class DocBookConverter(BaseConverter): def _decl_def_footer(self) -> list[str]: 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 ]) - + def finalize(self, *, fragment: bool = False) -> str: result = [] - result.append('') + if not fragment: + result.append('') if self._document_type == 'appendix': result += [ '', ] - for name in keys: + for (name, opt) in self._sorted_options(): id = make_xml_id(self._id_prefix + name) result += [ "", @@ -236,7 +286,7 @@ class DocBookConverter(BaseConverter): f""), "" ] - result += self._options[name].lines + result += opt.lines result += [ "", "" @@ -248,6 +298,134 @@ 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, + *, + # only for parallel rendering + _options_by_id: Optional[dict[str, str]] = None): + self._options_by_id = _options_by_id or {} + super().__init__({}, revision, markdown_by_default) + + def _parallel_render_prepare(self) -> Any: + return ((self._revision, self._markdown_by_default), { '_options_by_id': self._options_by_id }) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> ManpageConverter: + return cls(*a[0], **a[1]) + + 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 +436,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/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py new file mode 100644 index 000000000000..c968d3a1322c --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py @@ -0,0 +1,58 @@ +# this module only has to exist because cpython has a global interpreter lock +# and markdown-it is pure python code. ideally we'd just use thread pools, but +# the GIL prohibits this. + +import multiprocessing + +from typing import Any, Callable, ClassVar, Iterable, Optional, TypeVar + +R = TypeVar('R') +S = TypeVar('S') +T = TypeVar('T') +A = TypeVar('A') + +pool_processes: Optional[int] = None + +# this thing is impossible to type because there's so much global state involved. +# wrapping in a class to get access to Generic[] parameters is not sufficient +# because mypy is too weak, and unnecessarily obscures how much global state is +# needed in each worker to make this whole brouhaha work. +_map_worker_fn: Any = None +_map_worker_state_fn: Any = None +_map_worker_state_arg: Any = None + +def _map_worker_init(*args: Any) -> None: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + (_map_worker_fn, _map_worker_state_fn, _map_worker_state_arg) = args + +# NOTE: the state argument is never passed by any caller, we only use it as a localized +# cache for the created state in lieu of another global. it is effectively a global though. +def _map_worker_step(arg: Any, state: Any = []) -> Any: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + # if a Pool initializer throws it'll just be retried, leading to endless loops. + # doing the proper initialization only on first use avoids this. + if not state: + state.append(_map_worker_state_fn(_map_worker_state_arg)) + return _map_worker_fn(state[0], arg) + +def map(fn: Callable[[S, T], R], d: Iterable[T], chunk_size: int, + state_fn: Callable[[A], S], state_arg: A) -> list[R]: + """ + `[ fn(state, i) for i in d ]` where `state = state_fn(state_arg)`, but using multiprocessing + if `pool_processes` is not `None`. when using multiprocessing is used the state function will + be run once in ever worker process and `multiprocessing.Pool.imap` will be used. + + **NOTE:** neither `state_fn` nor `fn` are allowed to mutate global state! doing so will cause + discrepancies if `pool_processes` is not None, since each worker will have its own copy. + + **NOTE**: all data types that potentially cross a process boundary (so, all of them) must be + pickle-able. this excludes lambdas, bound functions, local functions, and a number of other + types depending on their exact internal structure. *theoretically* the pool constructor + can transfer non-pickleable data to worker processes, but this only works when using the + `fork` spawn method (and is thus not available on darwin or windows). + """ + if pool_processes is None: + state = state_fn(state_arg) + return [ fn(state, i) for i in d ] + with multiprocessing.Pool(pool_processes, _map_worker_init, (fn, state_fn, state_arg)) as p: + return list(p.imap(_map_worker_step, d, chunk_size)) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py index 7814b3a4854b..d20e056aacdc 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py b/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py new file mode 100644 index 000000000000..73a64fde8364 --- /dev/null +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py index 0f5d28407367..660c410a85cc 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py new file mode 100644 index 000000000000..fbfd21358a85 --- /dev/null +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py index 5a02fabde0fb..9608ed639218 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py index 4efcb9bdfc73..1d836a916d96 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -6,7 +6,7 @@ class Converter(nixos_render_docs.md.Converter): # actual renderer doesn't matter, we're just parsing. __renderer__ = nixos_render_docs.docbook.DocBookRenderer -def test_inline_anchor_simple() -> None: +def test_attr_span_parsing() -> None: c = Converter({}) assert c._parse("[]{#test}") == [ Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, @@ -14,14 +14,71 @@ def test_inline_anchor_simple() -> None: Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{#test}', markup='', info='', meta={}, block=True, hidden=False, children=[ - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) ] + assert c._parse("[]{.test}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{.test}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'class': 'test'}, map=None, + level=0, children=None, content='', markup='', info='', meta={}, block=False, + hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{.test1 .test2 #foo .test3 .test4}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{.test1 .test2 #foo .test3 .test4}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, + attrs={'class': 'test1 test2 test3 test4', 'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{#a #a}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{#a #a}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[]{#a #a}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[]{foo}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] -def test_inline_anchor_formatted() -> None: +def test_attr_span_formatted() -> None: c = Converter({}) assert c._parse("a[b c `d` ***e***]{#test}f") == [ Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, @@ -31,28 +88,30 @@ def test_inline_anchor_formatted() -> None: children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, content='a', markup='', info='', meta={}, block=False, hidden=False), - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'test'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='b c ', markup='', info='', meta={}, block=False, hidden=False), - Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, - children=None, content='d', markup='`', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content=' ', markup='', info='', meta={}, block=False, hidden=False), - Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, - content='', markup='*', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='b c ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=1, + children=None, content='d', markup='`', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=1, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='strong_open', tag='strong', nesting=1, attrs={}, map=None, level=1, + Token(type='strong_open', tag='strong', nesting=1, attrs={}, map=None, level=2, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=3, children=None, + content='e', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_close', tag='strong', nesting=-1, attrs={}, map=None, level=2, children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, - content='e', markup='', info='', meta={}, block=False, hidden=False), - Token(type='strong_close', tag='strong', nesting=-1, attrs={}, map=None, level=1, - children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=1, children=None, content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, content='f', markup='', info='', meta={}, block=False, hidden=False) ]), @@ -60,7 +119,7 @@ def test_inline_anchor_formatted() -> None: content='', markup='', info='', meta={}, block=True, hidden=False) ] -def test_inline_anchor_in_heading() -> None: +def test_attr_span_in_heading() -> None: c = Converter({}) # inline anchors in headers are allowed, but header attributes should be preferred assert c._parse("# foo []{#bar} baz") == [ @@ -71,8 +130,10 @@ def test_inline_anchor_in_heading() -> None: children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, content='foo ', markup='', info='', meta={}, block=False, hidden=False), - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, content=' baz', markup='', info='', meta={}, block=False, hidden=False) ]), @@ -80,7 +141,7 @@ def test_inline_anchor_in_heading() -> None: content='', markup='#', info='', meta={}, block=True, hidden=False) ] -def test_inline_anchor_on_links() -> None: +def test_attr_span_on_links() -> None: c = Converter({}) assert c._parse("[ [a](#bar) ]{#foo}") == [ Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, @@ -88,24 +149,26 @@ def test_inline_anchor_on_links() -> None: Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[ [a](#bar) ]{#foo}', markup='', info='', meta={}, block=True, hidden=False, children=[ - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, - children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content=' ', markup='', info='', meta={}, block=False, hidden=False), - Token(type='link_open', tag='a', nesting=1, attrs={'href': '#bar'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'foo'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_open', tag='a', nesting=1, attrs={'href': '#bar'}, map=None, level=1, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, content='a', markup='', info='', meta={}, block=False, hidden=False), - Token(type='link_close', tag='a', nesting=-1, attrs={}, map=None, level=0, children=None, + Token(type='link_close', tag='a', nesting=-1, attrs={}, map=None, level=1, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content=' ', markup='', info='', meta={}, block=False, hidden=False) + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) ] -def test_inline_anchor_nested() -> None: +def test_attr_span_nested() -> None: # inline anchors may contain more anchors (even though this is a bit pointless) c = Converter({}) assert c._parse("[ [a]{#bar} ]{#foo}") == [ @@ -114,20 +177,26 @@ def test_inline_anchor_nested() -> None: Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[ [a]{#bar} ]{#foo}', markup='', info='', meta={}, block=True, hidden=False, children=[ - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'foo'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, content=' ', markup='', info='', meta={}, block=False, hidden=False), - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=1, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='a ', markup='', info='', meta={}, block=False, hidden=False) + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=1, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) ] -def test_inline_anchor_escaping() -> None: +def test_attr_span_escaping() -> None: c = Converter({}) assert c._parse("\\[a]{#bar}") == [ Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, @@ -149,10 +218,12 @@ def test_inline_anchor_escaping() -> None: children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, content='\\', markup='', info='', meta={}, block=False, hidden=False), - Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), - Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='a', markup='', info='', meta={}, block=False, hidden=False) + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) @@ -277,3 +348,105 @@ def test_block_comment() -> None: assert c._parse("") == [] assert c._parse("") == [] assert c._parse("") == [] + +def test_heading_attributes() -> None: + c = Converter({}) + assert c._parse("# foo *bar* {#hid}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'hid'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo *bar* {#hid}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='bar', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("# foo--bar {#id-with--double-dashes}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'id-with--double-dashes'}, map=[0, 1], + level=0, children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo--bar {#id-with--double-dashes}', markup='', info='', meta={}, block=True, + hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo–bar', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_admonitions() -> None: + c = Converter({}) + assert c._parse("::: {.note}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.note}', meta={'kind': 'note'}, block=True, + hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.caution}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.caution}', meta={'kind': 'caution'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.tip}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.tip}', meta={'kind': 'tip'}, block=True, + hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.important}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.important}', meta={'kind': 'important'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.warning}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.warning}', meta={'kind': 'warning'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + +def test_example() -> None: + c = Converter({}) + assert c._parse("::: {.example}") == [ + Token(type='example_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup=':::', info=' {.example}', meta={}, block=True, hidden=False), + Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {#eid .example}") == [ + Token(type='example_open', tag='div', nesting=1, attrs={'id': 'eid'}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {#eid .example}', meta={}, block=True, + hidden=False), + Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.example .note}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='::: {.example .note}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='::: {.example .note}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 77fed6e67e7d..c7e9581d99b2 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "apx"; - version = "1.4.2"; + version = "1.7.0-1"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; - rev = version; - sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + rev = "v${version}"; + hash = "sha256-tonI3S0a08MbR369qaKS2BoWc3QzXWzTuGx/zSgUz7s="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index b42144762b34..5dc3859de56f 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.24.0"; + version = "2.25.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZbKkyRCzfnX8TPBeUYZk2b5M//g1cyiksUMBg0z7nlQ="; + sha256 = "sha256-J5vAvF22NKMvvaftfVugWYAP6uM6pcyKEPqRDf+J9A4="; }; - vendorHash = "sha256-TrJtuFzreIjq7fCw/XT1jniw9Ey9k6xmXotby6A651g="; + vendorHash = "sha256-GaESwr7rvDvjQ7zi/LbndiB2lQGmIELTx7wAJitj5kw="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index cfc23ff619dc..3d42d4907e79 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/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/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 877141126216..246e7c9c9810 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U="; + sha256 = "sha256-/btQP7I4zpIA0MWEQJVYnR1XhyudPnYD5Qx4vrW+Uq8="; }; - cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo="; + cargoSha256 = "sha256-CzLBOLtzIYqdWjTDKHVnc1YXXyj1HqvXzoFYHS0qxog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index d85e40bdc28a..f0032916db9d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -181,6 +181,10 @@ self = stdenv.mkDerivation { ]; makeFlags = [ + # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style + # of make jobserver. until gcc adds support for this we have to instruct make to use this + # old style or LTO builds will run their linking on only one thread, which takes forever. + "--jobserver-style=pipe" "profiledir=$(out)/etc/profile.d" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0" ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1"; diff --git a/pkgs/tools/package-management/repro-get/default.nix b/pkgs/tools/package-management/repro-get/default.nix new file mode 100644 index 000000000000..42b000658c88 --- /dev/null +++ b/pkgs/tools/package-management/repro-get/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, repro-get +, cacert +}: + +buildGoModule rec { + pname = "repro-get"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "reproducible-containers"; + repo = "repro-get"; + rev = "v${version}"; + sha256 = "sha256-2B4jNP58t+cfeHi5pICtB9+NwujRzkhl1d/cPkWlNrk="; + }; + + vendorHash = "sha256-GM8sKIZb2G9dBj2RoRO80hQrv8D+hHYo0O9FbBuK780="; + + nativeBuildInputs = [ installShellFiles ]; + + # The pkg/version test requires internet access, so disable it here and run it + # in passthru.pkg-version + preCheck = '' + rm -rf pkg/version + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/reproducible-containers/${pname}/pkg/version.Version=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd repro-get \ + --bash <($out/bin/repro-get completion bash) \ + --fish <($out/bin/repro-get completion fish) \ + --zsh <($out/bin/repro-get completion zsh) + ''; + + passthru.tests = { + "pkg-version" = repro-get.overrideAttrs (old: { + # see invalidateFetcherByDrvHash + name = "${repro-get.pname}-${builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf repro-get.drvPath))}"; + subPackages = [ "pkg/version" ]; + installPhase = '' + rm -rf $out + touch $out + ''; + preCheck = ""; + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputs = [ "out" ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ]; + }); + version = testers.testVersion { + package = repro-get; + command = "HOME=$(mktemp -d) repro-get -v"; + inherit version; + }; + }; + + meta = with lib; { + description = "Reproducible apt/dnf/apk/pacman, with content-addressing"; + homepage = "https://github.com/reproducible-containers/repro-get"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 130c9a42558e..11d08c0dfd5a 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "1.1.0"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; - rev = "v${version}"; - hash = "sha256-bjUDImMFwMhRjCa7XzGlqR8h+KfTsyxonrQlRGgApwo="; + rev = "refs/tags/v${version}"; + hash = "sha256-J+zQrokrAX5tRU/2RPPSaFDyfsACPHHQYbK5sO99CMs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 46aaf4a94d66..eb71b5147809 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/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/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index c25db9e2d398..7817329f06de 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -51,6 +51,11 @@ let --replace '"clang++"' '"clang++-UNSUPPORTED"' ''; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=use-after-free" + ]; + makeFlags = [ "PREFIX=$(out)" ]; buildPhase = '' common="$makeFlags -j$NIX_BUILD_CORES" diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index 67c850eba4ae..2a7701ed9e3f 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "age-plugin-yubikey"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x4J8lE4Peenu3I7bZ3yoLpyukkMHD2re63GCni0cfnI="; + sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg="; }; - cargoSha256 = "sha256-Qp7AXy044G17FxR2sopN00cgX91A8TAydrwvJrAfhns="; + cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index c2196cea686a..2b64480c4a00 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-kPDNTwsfI+8nOgsLv2aONrLGSRZhw5YzNntJ2tbE0oI="; + sha256 = "sha256-11dqfOi/DdfFrFTeboPyFkixXG+fCJ2jpHM55qsQ1jw="; }; - cargoSha256 = "sha256-fTdTgbeOQXEpLHq9tHiPLkttvaxS/WJ86h3jRdrfbJM="; + cargoHash = "sha256-u0vceIurenYnKfF3gWNw304hX4vVFoszZD7AMwffOmc="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix new file mode 100644 index 000000000000..785caa8f536d --- /dev/null +++ b/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/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 103c8aceed82..8180f9013df8 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/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/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 3e4072c8eaa6..4895e3def181 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "0.0.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-NdD1b/yHB1fizAl/5UsksQ5jrj1OW46Ff4eABPPam7w="; + hash = "sha256-AndX0PISGKhVmUFcJ2pCu8dqH67nVCe+25MIcF9d+8A="; }; - vendorHash = "sha256-/L3fGDa3aJit9forggszIjpekowh4LbNhxiJjHhzARs="; + vendorHash = "sha256-+a6GgKHQ1D/hW9MEutyfbNbyDJuQGJ7Vd9Pz6w08lfo="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f265444f53ab..884be4650585 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/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/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 27cf191018e4..4c00f41919c9 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.17.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-JD3ZFRWGCJq5VDGkTgIZuZPScQrNF4vsuCavBD3pigA="; + sha256 = "sha256-1WLhT94FNZ7be58uov/0vtvB7ET/WNY/tPSIuaW5zfc="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix index 8bf3e6983b6d..589e1f97e64b 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/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/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index edb10f384bdf..b897fe618710 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -40,6 +40,11 @@ python3.pkgs.buildPythonApplication rec { mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux ''; + NIX_CFLAGS_COMPILE = [ + # Needed with GCC 12 + "-Wno-error=dangling-pointer" + ]; + preInstall = lib.optionalString withDriver '' mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \ diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index e9e6314f2015..aa8c68382a39 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-vaObuFaQLm3WB36jE6Pri+zNSH4AgqlZF4d/Kymc2G4="; + hash = "sha256-CHLcG4L/TNfo5DI/r17kGh9mroCGXQVCkIW5RjVdhu4="; }; patches = [ diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 3330d20ac32f..e61649c767ad 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/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/pkgs/tools/security/enc/default.nix b/pkgs/tools/security/enc/default.nix new file mode 100644 index 000000000000..00d6d0211f80 --- /dev/null +++ b/pkgs/tools/security/enc/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, installShellFiles +}: + +buildGoModule rec { + pname = "enc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "life4"; + repo = "enc"; + rev = "v${version}"; + sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs="; + }; + vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw="; + + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = "."; + + ldflags = [ + "-s" + "-w" + "-X github.com/life4/enc/version.GitCommit=${version}" + ]; + + nativeCheckInputs = [ git ]; + + postInstall = '' + installShellCompletion --cmd enc \ + --bash <($out/bin/enc completion bash) \ + --fish <($out/bin/enc completion fish) \ + --zsh <($out/bin/enc completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/life4/enc"; + changelog = "https://github.com/life4/enc/releases/tag/v${version}"; + description = "A modern and friendly alternative to GnuPG"; + longDescription = '' + Enc is a CLI tool for encryption, a modern and friendly alternative to GnuPG. + It is easy to use, secure by default and can encrypt and decrypt files using password or encryption keys, + manage and download keys, and sign data. + Our goal was to make encryption available to all engineers without the need to learn a lot of new words, concepts, + and commands. It is the most beginner-friendly CLI tool for encryption, and keeping it that way is our top priority. + ''; + license = licenses.mit; + maintainers = with maintainers; [ rvnstn ]; + }; +} diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix index d58328693932..2c9ab122e657 100644 --- a/pkgs/tools/security/enum4linux-ng/default.nix +++ b/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/pkgs/tools/security/erosmb/default.nix b/pkgs/tools/security/erosmb/default.nix index 90165b658164..b7984feac513 100644 --- a/pkgs/tools/security/erosmb/default.nix +++ b/pkgs/tools/security/erosmb/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "erosmb"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; src = fetchFromGitHub { owner = "viktor02"; repo = "EroSmb"; rev = "refs/tags/v${version}"; - hash = "sha256-ThJwBKpxoTwHP84OlVKH62gQ3kfv83J8HNs5Mizi8Ck="; + hash = "sha256-9Zs5Z+3JiBiJkV9Ixl5pPmLv0dUT59CT0UkQDsmneWc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9718f0095d02..a710daca6013 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "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/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 459f9f12c1ea..daa0e8471158 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/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/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 18862b7940df..3831ff4d8e22 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/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="; + rev = "refs/tags/v${version}"; + hash = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk="; }; - vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; + vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4="; meta = with lib; { description = "Fast web fuzzer written in Go"; @@ -24,6 +24,7 @@ buildGoModule rec { or web servers. ''; homepage = "https://github.com/ffuf/ffuf"; + changelog = "https://github.com/ffuf/ffuf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index f86d807d4309..438c22f0046c 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -17,8 +17,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-McHzHK404kDB992T2f84dZHDxujpPIz4qglYMmv3kTw="; }; + pythonRelaxDeps = [ + "msgspec" + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -54,6 +59,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Extendable Pentesting Framework for the Automotive Domain"; homepage = "https://github.com/Fraunhofer-AISEC/gallia"; + changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab rumpelsepp ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/24.nix similarity index 87% rename from pkgs/tools/security/gnupg/23.nix rename to pkgs/tools/security/gnupg/24.nix index 2030e8195e68..c1f2825e8e93 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/24.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 @@ -11,11 +12,11 @@ assert guiSupport -> enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.3.7"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7hY6X7nsmf/BsY5l+u+NCGgAxXE9FaZyq1fTeZ2oNmk="; + sha256 = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -29,19 +30,13 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch - ./allow-import-of-previously-known-keys-even-without-UI.patch + # TODO: Refresh patch? Doesn't apply on 2.4.0 + #./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch - # Fix regression when using YubiKey devices as smart cards. - # See https://dev.gnupg.org/T6070 for details. - # Committed upstream, remove this patch when updating to the next release. - (fetchpatch { - url = "https://dev.gnupg.org/rGf34b9147eb3070bce80d53febaa564164cd6c977?diff=1"; - sha256 = "sha256-J/PLSz8yiEgtGv+r3BTGTHrikV70AbbHQPo9xbjaHFE="; - }) ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 @@ -85,6 +80,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/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index c4e910aa0352..7f7a18534734 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,18 +13,18 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.3"; + version = "1.15.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass"; rev = "v${version}"; - hash = "sha256-xXXlpr+qwks+hWTPMu9xJVIamLriipzm0XQqOpg8Ipw="; + hash = "sha256-Jm5H36DI6Mqdnm34+GUMEYxEefXLxgnwWo4fhKOayxY="; }; - vendorHash = "sha256-Tb7eIv2G/VfRP1J6taJjAOtZQakA2pcocZ9kZemcZo0="; + vendorHash = "sha256-IJSEU6a3AhA/cVTWXhVtNtvA/D0hyRlqL7pec1Tlyio="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 9e585e27dc27..f0632291a9a4 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-x8hf1cZw+Hhizp8/vA8qJ+A6ERJUenjMeiuW8IFb/N0="; + hash = "sha256-S97KQ/yCyE1wBDao5KBKWPvoH+DmwpEJRiB6uJCGyFA="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index c6db9a1d652a..d28db3bca2e3 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-KqW1q3CnniNeQFypeZ6x/ov58SOMfAX5P2MMDKjMYBg="; + hash = "sha256-tqZVzYO3yKyUxfC+pxG+QuW9GBoPBteOdJMchepZ1jo="; }; - vendorHash = "sha256-w1Kxocrwcgn0g6ZBJ7obHraHK397bJltUFkm+/p4H5Y="; + vendorHash = "sha256-48KwEcB5KRUwrKCuyNhhuSVRXE3U5/yVYE2xO05AeF8="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index f82b00fd201b..7ce9c4cc8709 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-5thMhZr/ZlMHMKS2ZOyuua1ZfQ2od7QGSDBQsVsf9Os="; + hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U="; }; - vendorHash = "sha256-Gt5nd+3BkNQrdcq5+a70rdBXvCang/2ayZuyyZWON64="; + vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index dc9646ce91dd..abb8eb653c5b 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-YnCX+DDZoKbiwbT8lNvAh0ANNCtEPvaLr9LCvLX8nwo="; + hash = "sha256-gwvrwLJTh58PiRsEC3juhnA/q6cX3nRh/hiunKnPvDQ="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index b02c6a896c39..d7c158e6a004 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -1,27 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gotrue-supabase +}: buildGoModule rec { pname = "gotrue"; - version = "2.42.2"; + version = "2.47.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-nMSvc90oZsAbDGktvSBMWZNEAGzz/INLK5K6hawteew="; + hash = "sha256-GBrdYlWvtlz/A/5Tn58EPYBL3X73D44GzbN1OrzwU8U="; }; - vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; + vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo="; ldflags = [ "-s" "-w" - "-X=github.com/netlify/gotrue/utilities.Version=${version}" + "-X=github.com/netlify/gotrue/internal/utilities.Version=${version}" ]; # integration tests require network to connect to postgres database doCheck = false; + passthru.tests.version = testers.testVersion { + package = gotrue-supabase; + command = "gotrue version"; + inherit version; + }; + meta = with lib; { homepage = "https://github.com/supabase/gotrue"; description = "A JWT based API for managing users and issuing JWT tokens"; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 4ab4d468d068..8b003ea4701f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/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.4"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s="; + hash = "sha256-2OMjqY1oTVKyEuCJrGGSQfgjQPSOQRx6LPhoFUuf/pw="; }; - cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M="; + cargoHash = "sha256-EhnQvVXv08l4ONnuIudU0WBw5AptD7OcvPUNOdpRZj4="; nativeBuildInputs = [ gpgme # for gpgme-config libgpg-error # for gpg-error-config + pkg-config python3 ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 9b3a9a44d9cf..f73710c1d19b 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.56.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-xNv4pI6iT6lNmjeUIW8ObPFJw9H1SiVTg9fRx6Osiwc="; + hash = "sha256-NACasOoCABoHmb4U5LvQ8EPO7G10A7uQtX4th/WJqrw="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-Sez5jNFdL11cHBBPcY0b8qUiupmjPo9MHwUUi7FaNiA="; + vendorHash = "sha256-DLY0tcacGFcP17IqUVvpVkUjd2xQMO5JZxltmL4b+Wo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 8f5e48ee37ec..1a7e45c8024d 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hologram"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; rev = version; - sha256 = "sha256-rdV/oVo+M5ALyU3a3XlA4kt+TLg0Rnr7/qDyZ9iuIb4="; + hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4="; }; postPatch = '' @@ -17,14 +17,14 @@ buildGoModule rec { rm -f agent/metadata_service_test.go server/persistent_ldap_test.go server/server_test.go ''; - vendorSha256 = "sha256-pEYMpBiNbq5eSDiFT+9gMjGHDeTzWIej802Zz6Xtays="; + vendorHash = "sha256-HI5+02qSQVLy6ZKaFjy1bWtvVk5bqMBg1umu2ic5HuY="; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aaronjheng ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7b26825b70c9..bcf55ea52639 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-XGKz4Y04EpfJGkEfUE20Egv9dFiSEHOpDcQ2OfJ9wu8="; + hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; }; - vendorHash = "sha256-PsASCNHR52E4TSIK5s0ReJptKcondq39Dn2PsMQ8laA="; + vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index 2047b311222e..95b126bce0cf 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/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/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 9492475aadb5..80be86403adf 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/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/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 3378e0d332c7..0253bdaeba45 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.7.2"; + version = "0.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA="; + hash = "sha256-F/25fVNM3ZSYqg6oeKT/PxCXBB3z5INBKMqYGAbFiQM="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 579f79329793..9e534298198c 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-limgyp13eh2FuD1MzqQn+NQ30fOJsvr8UT4kZrxnIPM="; + hash = "sha256-YjcvxDCIXHyc/7+lpg29wDrpe8WmQPWbhXvpIpWO17k="; }; - vendorHash = "sha256-nmZpYShVNAqBO8adxCSt9t3ocB3elWna06pIBG6dQNY="; + vendorHash = "sha256-DE2S70Jfd6Vgx7BXGbhSWTbRIbp8cbiuf8bolHCYMxg="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 140f032a5fde..dcb1c0bb0cbe 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, openldap +, openssl +, trousers +}: stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.8.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l"; + hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y="; }; - nativeBuildInputs = [ autoreconfHook libtool bison flex ]; - buildInputs = [ openssl trousers ]; + nativeBuildInputs = [ + autoreconfHook + bison + flex + ]; + + buildInputs = [ + openldap + openssl + trousers + ]; postPatch = '' substituteInPlace configure.ac \ @@ -20,18 +38,22 @@ stdenv.mkDerivation rec { --replace "groupadd" "true" \ --replace "chmod" "true" \ --replace "chgrp" "true" - substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out" ''; configureFlags = [ - "--prefix=$(out)" + "--prefix=" "--disable-ccatok" "--disable-icatok" ]; enableParallelBuilding = true; + installFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + meta = with lib; { + changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog"; description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix index f04ac1b1a401..6eb35099db2a 100644 --- a/pkgs/tools/security/pomerium-cli/default.nix +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -8,16 +8,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-lWrEWi9wT//9sTEJqo4BnjjzeYnmb2KFbVetXfsYk04="; + sha256 = "sha256-0JMMa85gMTZA0JtxpONVMakbsapAoCXdiL3+Whv5Pp0="; }; - vendorSha256 = "sha256-uME7g7zhA1ir1drmHB1FjLPJ1Km9XcvHHNIsIdOvYfo="; + vendorHash = "sha256-eATNBUQNspDdksF06VHIzwzEJfaFBlJt9OtONxH49s4="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/tools/security/posteid-seed-extractor/default.nix b/pkgs/tools/security/posteid-seed-extractor/default.nix new file mode 100644 index 000000000000..176b210b3779 --- /dev/null +++ b/pkgs/tools/security/posteid-seed-extractor/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication { + pname = "posteid-seed-extractor"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "simone36050"; + repo = "PosteID-seed-extractor"; + rev = "667e2997a98aa3273a6bf6b4b34ca77715120e7f"; + hash = "sha256-smNwp67HYbZuMrl0uf2X2yox2JqeEV6WzIBp4dALwgw="; + }; + + format = "other"; + + pythonPath = with python3Packages; [ + certifi + cffi + charset-normalizer + cryptography + idna + jwcrypto + pycparser + pycryptodome + pyotp + qrcode + requests + urllib3 + wrapt + ]; + + installPhase = '' + runHook preInstall + install -Dm755 extractor.py $out/bin/posteid-seed-extractor + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/simone36050/PosteID-seed-extractor"; + description = "Extract OTP seed instead of using PosteID app"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index befc07e2e18d..d3295de5bad8 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.8.0"; + version = "4.10.2"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGxSiubZECNwoFkkJOySI4LOmwk7DXVtY74XBCsr+uk="; + sha256 = "sha256-GQs+wBq47sn3h8I87p+HErBmLMs8Dzh9xj3xMYDsXm4="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-j8/sVdqxLmrvQwHn+uj8+q+ne98xcIeQKS1VQJcrkh0="; + vendorSha256 = "sha256-W213KQu4FuJcT/cJOvS+WMw1fXBcSoZ4yssI06JAIc8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index c83c7fb4cfe3..345e36756f66 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/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/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 15c0d662ce2c..96f0e44716c5 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KREYWM5WOdPzLbOlrATiCCfFwE951KEo03yWNfyG8Bw="; + rev = "refs/tags/v${version}"; + hash = "sha256-+LplLeczLS+9EG0tZsiEs162/65zMCZfDDEq0iYQrGY="; }; - cargoSha256 = "sha256-Ul53/hDUFRb4xmILoMXXk2t465Vv+MQP4iLNn1twwnc="; + cargoHash = "sha256-FpoRO2g+R+Fo146kM0W8b1LHTEBHbGXURoX5jJk7lqY="; nativeBuildInputs = [ pkg-config @@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; + changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ fab xrelkd ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 8a6cc97ff15d..6ba21884325e 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/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/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index fdf9f2f047d1..06047a1925c6 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-fSVRDmgDbByAWVzvidrtqCQE+LzS1WpzOAt12ZiNBT4="; + hash = "sha256-d21TQRPRDEDYj7Fqf7R7mHj2tLPd/EXNkeL56KyLgIg="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-oW1C0EEaNsT4ne1g4kyb+A8sbXgzCAJlhJHUmdH2r/0="; + vendorHash = "sha256-Oh8tldLuM3j17OUX1TkgyOL9Ae/x1H8FrB2lNbtZ8pI="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index bc694986c8d1..fcd1487dfb5d 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/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/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 3f4613b98762..00dd9c00be20 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.26.0"; + version = "3.27.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-cjggYIc/xy7w8Q8yXd26QWr1ky4gMuwRAmxrEObVlx0="; + hash = "sha256-oZfqRNKj/cQw7b933qzQWz1N25zXG5bmCjah4sA5wRY="; }; - vendorHash = "sha256-z2na/CO/YqIYEAYJ9ATQ/wbOOBFt0Kr+ERN5TCFbZbA="; + vendorHash = "sha256-IiMFSYZ7kdb5HHPFuRJKi+WXLdERSwyph1vSEQ/7RRk="; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 42a4e1ccb755..5c2a2e9b0d89 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-P/mQoW4lG6U83WEjn5urpFa7q5mN+XOrIOkzf2pslwQ="; + sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE="; }; - vendorSha256 = "sha256-Z1iwJXbnSqIu/zo7iKLnh0yy1Dh0e5HwXoBkkt9xaqA="; + vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vaultwarden/update.nix b/pkgs/tools/security/vaultwarden/update.nix index 0fc4b45a1296..44af26ada0d8 100644 --- a/pkgs/tools/security/vaultwarden/update.nix +++ b/pkgs/tools/security/vaultwarden/update.nix @@ -1,5 +1,7 @@ { writeShellScript , lib +, nix +, nix-prefetch-git , nix-update , curl , git @@ -9,7 +11,7 @@ }: writeShellScript "update-vaultwarden" '' - PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix-update ]} + PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix nix-prefetch-git nix-update ]} set -euxo pipefail @@ -17,6 +19,11 @@ writeShellScript "update-vaultwarden" '' nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION" URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2" - WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"([^\"]+)\".*/\\1/") + WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/") + old_hash_bw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.src.outputHash) + old_hash_vw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) + new_hash_bw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/bitwarden/clients.git --rev "web-v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + new_hash_vw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + sed -e "s#$old_hash_bw#$new_hash_bw#" -e "s#$old_hash_vw#$new_hash_vw#" -i pkgs/tools/security/vaultwarden/webvault.nix nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" '' diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 74a75e24339c..28b60517ad65 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -1,28 +1,73 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, git +, nixosTests +, nodejs-16_x +, python3 +}: + +let + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; -stdenv.mkDerivation rec { - pname = "vaultwarden-webvault"; version = "2022.12.0"; - src = fetchurl { - url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - hash = "sha256-QC3/aqIF2NdJPHmwUbvJR62wsUGBrgsHJCyqBJ/0gMc="; + bw_web_builds = fetchFromGitHub { + owner = "dani-garcia"; + repo = "bw_web_builds"; + rev = "v${version}"; + hash = "sha256-4yUE0ySUCKmmbca+T8qjqSO0AHZEUAHZ4nheRjpDnZo="; + }; +in buildNpmPackage' { + pname = "vaultwarden-webvault"; + inherit version; + + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "web-v${version}"; + hash = "sha256-CsbnnP12P7JuGDOm5Ia73SzET/jCx3qRbz9vdUf7lCA="; }; - buildCommand = '' - mkdir -p $out/share/vaultwarden/ - cd $out/share/vaultwarden/ - tar xf $src - mv web-vault vault + npmDepsHash = "sha256-wWOtVGNOzY2s82nfQDuWgA4ukpJxJr8Z7Y+rFPq2QdU="; + + postPatch = '' + ln -s ${bw_web_builds}/{patches,resources} .. + PATH="${git}/bin:$PATH" VAULT_VERSION=${bw_web_builds.rev} \ + bash ${bw_web_builds}/scripts/apply_patches.sh ''; - passthru.tests = nixosTests.vaultwarden; + nativeBuildInputs = [ + python3 + ]; + + makeCacheWritable = true; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmBuildScript = "dist:oss:selfhost"; + + npmBuildFlags = [ + "--workspace" "apps/web" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/vaultwarden + mv apps/web/build $out/share/vaultwarden/vault + runHook postInstall + ''; + + passthru = { + inherit bw_web_builds; + tests = nixosTests.vaultwarden; + }; meta = with lib; { description = "Integrates the web vault into vaultwarden"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with maintainers; [ msteen mic92 ]; + maintainers = with maintainers; [ dotlambda msteen mic92 ]; }; } diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 6aec3dd105f2..49c0f8cd14fb 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/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/pkgs/tools/security/yatas/default.nix b/pkgs/tools/security/yatas/default.nix new file mode 100644 index 000000000000..d42068fe687c --- /dev/null +++ b/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/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 83c2e535403d..77b6b86ffd6e 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/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/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 88f39e8a63e4..98ac2254fb6e 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { "iasl" ]; - NIX_CFLAGS_COMPILE = "-O3"; + NIX_CFLAGS_COMPILE = [ + "-O3" + # Needed with GCC 12 + "-Wno-dangling-pointer" + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 0d72541afe28..ceee8c9efa6c 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.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/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 829d249da5b0..d18225a93b9b 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; + sha256 = "sha256-OMgMmMWkTxXlNmPkUQCX/WjW7CB1jv3zqSUDfBgyMus="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/tools/system/erdtree/default.nix new file mode 100644 index 000000000000..a60071e44739 --- /dev/null +++ b/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/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index de4acffa63e4..0e746b0d07a4 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + postPatch = '' + sed '1i#include ' -i lib/src/facts/glib/load_average_resolver.cc # gcc12 + ''; + CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid"; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index b9391d7000fb..21691b0d4472 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/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/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 305761e0c3be..215818862cdb 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk="; + sha256 = "sha256-OrlNE1A71q4XAauYNfumV1Ev1wBpFIBxPiw7aF++yjM="; }; nativeBuildInputs = [ autoreconfHook ] diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 2ef4d13c366b..d9b1bc06b205 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , lib , rustPlatform , withCmd ? false @@ -6,16 +7,24 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/v3P5C0F/FVPJqJ38dzSnAc7ua2fOs3BeX9BDoQ8bDw="; + sha256 = "sha256-mQSbsJ+3mKoDMg0ewwR7UvXUq+5WA9aTPKWCaTz8nDE="; }; - cargoHash = "sha256-KXsW0fgbBy0tf/He0vH9Xq8yGuz77H/jeIabgw3ppy8="; + cargoHash = "sha256-Pu96OGfnXNaIse/IcwFJWxGMlKOVhZ6DtvgXJkHh+Ao="; + + cargoPatches = [ + (fetchpatch { + name = "serialize-cfg-parsing-tests-for-1.2.0.patch"; + url = "https://github.com/jtroo/kanata/commit/9ef1e80fbcb40402262e08bd9196d000f73f686d.patch"; + hash = "sha256-/FhyaYx4usDjGoVfRktf9dtwjY4oXdMQKqxLz00/NPY="; + }) + ]; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a84113fe20ba..5f24ddf62609 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,15 @@ let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.37.1"; + # Don't forget to update go.d.plugin.nix as well + version = "1.38.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-SsrdjFENPkI7Ed1gKt28sygJ5NgZ5un+5baIQ3Kv7yE="; + sha256 = "sha256-y+rjqS95JS1PU+iR8c7spcg1UoYCjpzbpunTAgTJ35U="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index ebc552687cf7..5b45ddbb3ae2 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,17 +1,16 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { +{ lib, fetchFromGitHub, buildGo119Module }: +buildGo119Module rec { pname = "netdata-go.d.plugin"; - version = "0.32.3"; + version = "0.50.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "sha256-SayFqr6n6OLLUXseYiR8iBIf2xeDEHXHD0qBrgHY6+o="; + sha256 = "5kDc6zszVuFTDkNMuHBRwrfDnH+AdD6ULzmywtvL8iA="; }; - vendorSha256 = "sha256-tIuHWfAjvr5s2nJSnhnMZIjyy77BbobwgQoDOy4gdGI="; + vendorSha256 = "sha256-Wv6xqzpQxlZCrVnS+g9t1qiYCkm3NfXfW8XDYA9Txxs="; doCheck = false; diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 0daaf6ee7ed3..44d0063414e2 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -2,7 +2,7 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am index a0a972e8f..b4a2a5f53 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -78,15 +78,7 @@ diff --git a/system/Makefile.am b/system/Makefile.am index a88ccab65..bda6ee2b6 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -3,7 +3,6 @@ - - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in - CLEANFILES = \ -- edit-config \ - netdata-openrc \ - netdata.logrotate \ - netdata.service \ -@@ -20,15 +19,13 @@ include $(top_srcdir)/build/subst.inc +@@ -19,15 +19,13 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch index fa7a0e7ad9c2..a03593896d96 100644 --- a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -3,7 +3,7 @@ Shrink closure size by avoiding paths embedded from configure call. https://github.com/NixOS/nixpkgs/issues/175693 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c -@@ -248,7 +248,9 @@ void print_build_info(void) { +@@ -247,7 +247,9 @@ void print_build_info(void) { char *prebuilt_distro = NULL; get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/tools/system/rex/default.nix index 2bb67333121e..cf59a22cecee 100644 --- a/pkgs/tools/system/rex/default.nix +++ b/pkgs/tools/system/rex/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchurl, perlPackages, rsync, ... }: +{ pkgs, lib, fetchurl, perlPackages, rsync, installShellFiles, ... }: perlPackages.buildPerlPackage rec { pname = "Rex"; @@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec { rsync ]; - nativeBuildInputs = with perlPackages; [ ParallelForkManager ]; + nativeBuildInputs = with perlPackages; [ installShellFiles ParallelForkManager ]; propagatedBuildInputs = with perlPackages; [ AWSSignature4 @@ -44,6 +44,17 @@ perlPackages.buildPerlPackage rec { doCheck = false; + outputs = [ "out" ]; + + fixupPhase = '' + for sh in bash zsh; do + substituteInPlace ./share/rex-tab-completion.$sh \ + --replace 'perl' "${pkgs.perl.withPackages (ps: [ ps.YAML ])}/bin/perl" + done + installShellCompletion --name _rex --zsh ./share/rex-tab-completion.zsh + installShellCompletion --name rex --bash ./share/rex-tab-completion.bash + ''; + meta = { homepage = "https://www.rexify.org"; description = "The friendly automation framework"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 47542d25370d..d7e23a9acb01 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE="; }; + postPatch = '' + sed '1i#include ' -i src/rocm_smi{,_gpu_metrics}.cc # since gcc12 probably + ''; + nativeBuildInputs = [ cmake wrapPython ]; patches = [ ./cmake.patch ]; diff --git a/pkgs/tools/system/s0ix-selftest-tool/default.nix b/pkgs/tools/system/s0ix-selftest-tool/default.nix new file mode 100644 index 000000000000..193fbb0aef5f --- /dev/null +++ b/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/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index aa9ffa6f391a..aea767e323aa 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/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/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix index 7b9c8f2e57df..43d7480fc757 100644 --- a/pkgs/tools/system/uefitool/common.nix +++ b/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/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix new file mode 100644 index 000000000000..f4003ed934d6 --- /dev/null +++ b/pkgs/tools/system/zps/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zps"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "zps"; + rev = version; + hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + postInstall = '' + mkdir -p $out/share/applications + substitute ../.application/zps.desktop $out/share/applications/zps.desktop \ + --replace Exec=zps Exec=$out/zps \ + ''; + + meta = with lib; { + description = "A small utility for listing and reaping zombie processes on GNU/Linux"; + homepage = "https://github.com/orhun/zps"; + changelog = "https://github.com/orhun/zps/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 53cb9b876f42..27614de6b281 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM="; + hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI="; }; - vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU="; + vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4="; ldflags = [ "-s" diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 40ddc9263e8c..a8e8aa1a851d 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.43.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-YL2rKsP5FSoG1gIyxQtt9kovBAyu8Flko5RxXRQy5mQ="; + sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc="; }; depsExtraArgs = { @@ -39,13 +39,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-SUNBnJP8B/HvlozcCbehL1A2/WudYE20DIPc7/fYF/k="; - - checkFlags = [ - # test is broken - # https://github.com/Wilfred/difftastic/issues/479 - "--skip=files::tests::test_gzip_is_binary" - ]; + cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 6a0c5fc57ee9..c6c92b876ffa 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI="; + sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24="; }; nativeBuildInputs = [ perl gettext ]; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 796aa0da8f91..8912f3ac2c3f 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.6"; + version = "5.0.0"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278="; + sha256 = "sha256-Lcd+rLO4G2i5FTq/okjKQ1+EIfuZ8khkCijgeDxxwq8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 93cf684c1990..ee78451aae8d 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "2021-04-24"; src = fetchurl { - url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz"; - hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4="; + url = "https://web.archive.org/web/20220603034455/https://bellard.org/libnc/gpt2tc-2021-04-24.tar.gz"; + hash = "sha256-6oTxnbBwjHAXVrWMjOQVwdODbqLRoinx00pi29ff5w0="; }; patches = [ diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index a38251557c09..215f7e7d25b8 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -5,6 +5,7 @@ , autoreconfHook , pkg-config , texinfo +, bison , bash }: @@ -51,7 +52,9 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + # Required due to the patch that changes .ypp files. + ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison; buildInputs = [ perl bash ] ++ lib.optionals enableGhostscript [ ghostscript ] ++ lib.optionals enableHtml [ psutils netpbm ]; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index d23486159013..acb4e373e809 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -1,26 +1,25 @@ { lib , fetchFromGitHub +, ghostscript , imagemagick +, poppler_utils , python3 -, tesseract -, xpdf +, tesseract5 }: python3.pkgs.buildPythonApplication rec { pname = "invoice2data"; - version = "0.3.6"; + version = "0.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "invoice-x"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t1jgLyKtQsLINlnkCdSbVfTM6B/EiD1yGtx9UHjyZVE="; + sha256 = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools-git - ]; + buildInputs = with python3.pkgs; [ setuptools-git ]; propagatedBuildInputs = with python3.pkgs; [ chardet @@ -28,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { pdfminer-six pillow pyyaml + setuptools unidecode ]; @@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec { ''; makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ + ghostscript imagemagick - tesseract - xpdf + tesseract5 + poppler_utils ])]; # Tests fails even when ran manually on my ubuntu machine !! diff --git a/pkgs/tools/text/justify/default.nix b/pkgs/tools/text/justify/default.nix index 1e18e22db8e2..86de7365663e 100644 --- a/pkgs/tools/text/justify/default.nix +++ b/pkgs/tools/text/justify/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc="; }; + postPatch = '' + sed '1i#include ' -i src/stringHelper.h # gcc12 + ''; + nativeBuildInputs = [ cmake ]; installPhase = '' diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 62a23318ca2f..203a79fa381d 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mawk"; - version = "1.3.4-20200120"; + version = "1.3.4-20230203"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; - sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; + sha256 = "sha256-bbejKsecURB60xpAfU+SxrhC3eL2inUztOe3sD6JAL4="; }; meta = with lib; { diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index c4fc19ef1a7f..7b7062a7526a 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.4"; + version = "0.3.8"; src = fetchCrate { inherit pname version; - hash = "sha256-Bc9nUY2XyNlgOI436omg885Qm0BtqcrFsJz6qr2Zhys="; + hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68="; }; - cargoHash = "sha256-pH5ZN6bTjstrSTv0hdOoyWAdRLRjALarML3ZVoYvGRI="; + cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix new file mode 100644 index 000000000000..c8bc79c2a6fc --- /dev/null +++ b/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/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index cba1e97591ef..29c6e54ee5f6 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-uXfvE34yRrTUjh/HTMvOeZVxX4Drt6sxziaazg0CR3I="; + hash = "sha256-K7SkfUxav/r8icrpdfnpFTSZdYV9qUEvYZ2dGSbaP0w="; }; - cargoHash = "sha256-ol06ErggVLw2ThpXq9NRWEr7ymDSEBN4ae5zUmHKa7k="; + cargoHash = "sha256-Uvg0h0s3xtv/bVjqWLldvM/R5HQ6yoHdnBXvpUp/E3A="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 020ebdc0ca3d..d94382524b91 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.4"; + version = "0.1.5"; src = fetchCrate { inherit pname version; - hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU="; + hash = "sha256-822RQKgedxQ+VFNDv20tFUc2Xl56Ivub+/EXNrLRfGM="; }; - cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU="; + cargoHash = "sha256-mX2EKjuWM1KW8DXFdYFKQfASjdqZCW78F1twZNQQr7o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index d3bf8b2d8bf4..9d00c8e1fd12 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.25"; + version = "0.4.26"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-9zq3y7fNbGkprekzPDnJV4/IkAFUGEydkWAtr49mhdg="; + sha256 = "sha256-+K2mbVbOMQDumcPgiPtqDts/RGi+E0lF7Cftt86X/5A="; }; - cargoSha256 = "sha256-6UiE/b6iJkuM/9g5yhB33WwTZ2VYlWFWQdfdHzA39CM="; + cargoHash = "sha256-C9ziW3LUBGR/K+nR3mDr62KoE9p3mn+50nfd/3NFjro="; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 47f74684c6f1..e8a7e4ecf5a2 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -42,10 +42,14 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/mdcat-*/out/mdcat.1 - installShellCompletion \ - --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash \ - --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish \ - --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat + ln -sr $out/bin/{mdcat,mdless} + + for bin in mdcat mdless; do + installShellCompletion \ + --bash $releaseDir/build/mdcat-*/out/completions/$bin.bash \ + --fish $releaseDir/build/mdcat-*/out/completions/$bin.fish \ + --zsh $releaseDir/build/mdcat-*/out/completions/_$bin + done ''; meta = with lib; { diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index ebc7cdcf716c..55c66f7a5408 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ov"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-ow2tIML7+x0X3FSpr4UQ8bzzYhZJZ9pZL8eNReEjitQ="; + hash = "sha256-tbJ3Es6huu+0HcpoiNpYLbxsm0QCWYZk6bX2MdQxT2I="; }; - vendorHash = "sha256-X2/kcXxdGwFvdiTu1MGyv90OngWmR/xR2YtjvmLkiVE="; + vendorHash = "sha256-EjLslvc0cgvD7LjuDa49h/qt6K4Z9DEtQjV/LYkKwKo="; ldflags = [ "-X main.Version=v${version}" diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index 032e9474128a..4145ec656d20 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=mismatched-new-delete" + ]; + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace Makefile \ --replace "-msse2" "" --replace "-DUSE_SSE2" "" diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 0802f7b98361..0ddd7509c9f1 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE="; }; + # gcc12; see https://github.com/ivan-tkatchev/tab/commit/673bdac998 + postPatch = '' + sed '1i#include ' -i deps.h + ''; + nativeCheckInputs = [ python3 ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 9f3375c7e41c..50cd3d9411ec 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv" wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/" - '' + (if installSymlinks then '' + '' + lib.optionalString installSymlinks '' make install-links prefix="$out" - '' else ""); + ''; meta = with lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index cd1147ba4c7f..1bfdfadd03a8 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.22.0"; + version = "2.23.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-/8npVrVyyxYLiJotCdqeGE0d9w8pOjShx1fpmRkKW9k="; + hash = "sha256-HvdopsSI5CZOAA+C+FJGc7WhrA2qt43cAHe9HoxO91o="; }; - vendorHash = "sha256-7P77tR2wACRgF+8A/L/wPcq6etwzAX3pFO46FfGVTiE="; + vendorHash = "sha256-aH8KWvTXRlWVR/RdYlGjpZ4bOncQfLap1PVKxEnaz6A="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 9865c302f985..829ea2c66eba 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -4,35 +4,42 @@ let flreSrc = fetchFromGitHub { owner = "benibela"; repo = "flre"; - rev = "5aa8a9e032feff7a5790104f2d53fa74c70bb1d9"; # latest as of 0.9.8 release date - sha256 = "1zny494jm92fjgfirzwmxff988j4yygblaxmaclkkmcvzkjrzs05"; + rev = "3e926d45d4352f1b7c7cd411ccd625df117dad5c"; + hash = "sha256-fs7CIjd3fwD/SORYh5pmJxIdrr8F9e36TNmnKUbUxP0="; }; - synapseSrc = fetchsvn { - url = "http://svn.code.sf.net/p/synalist/code/synapse/40/"; - rev = 237; - sha256 = "0ciqd2xgpinwrk42cpyinh9gz2i5s5rlww4mdlsca1h6saivji96"; + synapseSrc = fetchFromGitHub { + owner = "benibela"; + repo = "ararat-synapse"; + rev = "7a77db926de66809080bada68b54172da7f84c0e"; + hash = "sha256-bVLQ0ohGJYtuP88Krxy9a7RnHHrW0OWw8H/uxa3PerU="; }; rcmdlineSrc = fetchFromGitHub { owner = "benibela"; repo = "rcmdline"; - rev = "96859e574e82d76eae49d5552a8c5aa7574a5987"; # latest as of 0.9.8 release date - sha256 = "0vwvpwrxsy9axicbck143yfxxrdifc026pv9c2lzqxzskf9fd78b"; + rev = "ea02b770c4568717dd7b3b72da191a8bbcb4c751"; + hash = "sha256-6YtvAf0joRvtCKbUAaLwuwABw1GEIzammFLhboq9aG0="; }; internettoolsSrc = fetchFromGitHub { owner = "benibela"; repo = "internettools"; - rev = "c9c5cc3a87271180d4fb5bb0b17040763d2cfe06"; # latest as of 0.9.8 release date - sha256 = "057hn7cb1vy827gvim3b6vwgfdh2ckjy8h9yj1ry7lv6hw8ynx6n"; + rev = "dd972caaa4415468fa679ea7262976ead3fd3e38"; + hash = "sha256-09sADxPiE6ky1EX7dTXRBYVT3IarUcLYf5knzi7+CHU="; + }; + pasdblstrutilsSrc = fetchFromGitHub { + owner = "BeRo1985"; + repo = "pasdblstrutils"; + rev = "1696f0a2b822fef26c8992f96620f1be129cfa99"; + hash = "sha256-x0AjOTa1g7gJOR2iBO76yBt1kzcRNujHRUsq5QOlfP0="; }; in stdenv.mkDerivation rec { pname = "xidel"; - version = "0.9.8"; + version = "unstable-2022-11-01"; src = fetchFromGitHub { owner = "benibela"; repo = pname; - rev = "Xidel_${version}"; - sha256 = "0q75jjyciybvj6y17s2283zis9fcw8w5pfsq8bn7diinnbjnzgl6"; + rev = "6d5655c1d73b88ddeb32d2450a35ee36e4762bb8"; + hash = "sha256-9x2d5AKRBjocRawRHdeI4heIM5nb00/F/EIj+/to7ac="; }; nativeBuildInputs = [ fpc ]; @@ -53,9 +60,10 @@ in stdenv.mkDerivation rec { ''; preBuildPhase = '' - mkdir -p import/{flre,synapse} rcmdline internettools + mkdir -p import/{flre,synapse,pasdblstrutils} rcmdline internettools cp -R ${flreSrc}/. import/flre cp -R ${synapseSrc}/. import/synapse + cp -R ${pasdblstrutilsSrc}/. import/pasdblstrutils cp -R ${rcmdlineSrc}/. rcmdline cp -R ${internettoolsSrc}/. internettools ''; @@ -72,20 +80,11 @@ in stdenv.mkDerivation rec { cp xidel "$out/bin/" ''; - doCheck = true; - + # disabled, because tests require network checkPhase = '' - # Not all, if any, of these tests are blockers. Failing or not this phase will pass. - # As of 2021-08-15, all of 37 failed tests are linked with the lack of network access. ./tests/tests.sh ''; - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/xidel --version | grep "${version}" - ''; - meta = with lib; { description = "Command line tool to download and extract data from HTML/XML pages as well as JSON APIs"; homepage = "https://www.videlibri.de/xidel.html"; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 0513035094bd..a5b677888420 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmark"; - version = "2.2.30"; + version = "2.2.31"; src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; rev = "v${version}"; - sha256 = "sha256-14SGA3a72i+HYptTEpxf4YiLXZzZ1R/t1agvm3ie4g8="; + sha256 = "sha256-mCnlLsvkkB7ZvBCLYHvYanz9XgWo92v5M/kKulhUKTE="; }; - vendorSha256 = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; + vendorHash = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/typesetting/tex/advi/default.nix b/pkgs/tools/typesetting/tex/advi/default.nix new file mode 100644 index 000000000000..0be4d4a9574c --- /dev/null +++ b/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/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index fbb6fdb0fe01..e9017333c943 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -82,7 +82,8 @@ rec { findLhs2TeXIncludes = - { rootFile + { lib + , rootFile }: builtins.genericClosure { @@ -97,7 +98,7 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + in pkgs.lib.concatMap (x: lib.optionals (builtins.pathExists x) [{key = x;}]) (map (x: dirOf key + ("/" + x)) deps); }; diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 61150fa8b7cf..c02ca35296ec 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -2,37 +2,47 @@ 1itl: { # no indentation $a} -# trash packages we don't want -/^name .*\./,/^$/d - -# quote package names, as some start with a number :-/ -s/^name (.*)/name "\1"/ - -# extract revision -s/^revision ([0-9]*)$/ revision = \1;/p - # form an attrmap per package -/^name /s/^name (.*)/\1 = {/p -/^$/,1i}; +# ignore packages whose name contains "." (such as binaries) +/^name ([^.]+)$/,/^$/{ + # quote package names, as some start with a number :-/ + s/^name (.*)$/"\1" = {/p + /^$/,1i}; -# extract hashes of *.tar.xz -s/^containerchecksum (.*)/ sha512.run = "\1";/p -s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p -s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p -/^runfiles /i\ hasRunfiles = true; + # extract revision + s/^revision ([0-9]*)$/ revision = \1;/p -# number of path components to strip, defaulting to 1 ("texmf-dist/") -/^relocated 1/i\ stripPrefix = 0; + # extract hashes of *.tar.xz + s/^containerchecksum (.*)/ sha512.run = "\1";/p + s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p + s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p + /^runfiles /i\ hasRunfiles = true; -# extract version and clean unwanted chars from it -/^catalogue-version/y/ \/~/_--/ -/^catalogue-version/s/[\#,:\(\)]//g -s/^catalogue-version_(.*)/ version = "\1";/p + # number of path components to strip, defaulting to 1 ("texmf-dist/") + /^relocated 1/i\ stripPrefix = 0; -# extract deps -s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p + # extract version and clean unwanted chars from it + /^catalogue-version/y/ \/~/_--/ + /^catalogue-version/s/[\#,:\(\)]//g + s/^catalogue-version_(.*)/ version = "\1";/p -# extract hyphenation patterns and formats -# (this may create duplicate lines, use uniq to remove them) -/^execute\sAddHyphen/i\ hasHyphens = true; -/^execute\sAddFormat/i\ hasFormats = true; + # extract deps + /^depend [^.]+$/{ + s/^depend (.+)$/ deps."\1" = tl."\1";/ + + # loop through following depend lines + :next + h ; N # save & read next line + s/\ndepend (.+)\.(.+)$// + s/\ndepend (.+)$/\n deps."\1" = tl."\1";/ + t next # loop if the previous lines matched + + x; p; x # print saved deps + s/^.*\n// # remove deps, resume processing + } + + # extract hyphenation patterns and formats + # (this may create duplicate lines, use uniq to remove them) + /^execute\sAddHyphen/i\ hasHyphens = true; + /^execute\sAddFormat/i\ hasFormats = true; +} diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 9e989fcc4750..28d55f13fe3d 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/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/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 32bc31346a00..8cf9dc849896 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/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/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index 0967653464c2..91182c8e179d 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/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/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 40e3bfd5c1bd..97c80ec560cc 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -118,7 +118,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; license = with licenses; [ asl20 gpl3Plus ]; - maintainers = with maintainers; [ phile314 illustris ]; + maintainers = with maintainers; [ illustris ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index 7d0da22221b0..af2258b1a206 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/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/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index fe05078ba3e4..3fb56c6d0317 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/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/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix new file mode 100644 index 000000000000..6bb451aa9e85 --- /dev/null +++ b/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.1"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "multipass"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AIZs+NRAn/r9EjTx9InDZzS4ycni4MZQXmC0A5rpaJk="; + 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/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index 1b3461912492..f285fb12821e 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-tyIvAe6wQxxHRkD46dYjHYtvv7OWDuurYi6tsdL8BtE="; + hash = "sha256-BWHQtaDnM6lBEMkD8Y7M2NrWD78rY3yL8dzsa6PBiR0="; }; - cargoHash = "sha256-N42dGImQPqa/NXpqhEnMDsG1mrdNh1BM0BDvRS6Oiio="; + cargoHash = "sha256-uckdpzCD3ItUVvpF2fHofcZFkQZzt8Xz/VWFiQ9Hkrs="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 319a9249f0a4..42f95735de59 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }: +{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }: stdenv.mkDerivation rec { pname = "ydotool"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; rev = "v${version}"; - sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI="; + hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng="; }; + postPatch = '' + substituteInPlace Daemon/ydotoold.c \ + --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" + substituteInPlace Daemon/ydotool.service.in \ + --replace "/usr/bin/kill" "${util-linux}/bin/kill" + ''; + strictDeps = true; nativeBuildInputs = [ cmake scdoc ]; - postInstall = '' - substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \ - --replace /usr/bin/kill "${util-linux}/bin/kill" - ''; - meta = with lib; { homepage = "https://github.com/ReimuNotMoe/ydotool"; description = "Generic Linux command-line automation tool"; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 18c32b9a9d92..948040deecbd 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, callPackage, newScope, Agda }: +{ pkgs, lib, newScope, Agda }: let mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); mkAgdaPackages' = Agda: self: let - callPackage = self.callPackage; + inherit (self) callPackage; inherit (callPackage ../build-support/agda { inherit Agda self; inherit (pkgs.haskellPackages) ghcWithPackages; @@ -13,10 +13,7 @@ let lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); - agda = withPackages [] // { - inherit withPackages; - passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); - }; + agda = withPackages []; standard-library = callPackage ../development/libraries/agda/standard-library { inherit (pkgs.haskellPackages) ghcWithPackages; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 951fb2e4adb5..d091a2eecc77 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -126,6 +126,7 @@ mapAliases ({ 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 @@ -379,6 +380,7 @@ mapAliases ({ docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05 docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05 + dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 @@ -581,6 +583,7 @@ mapAliases ({ go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 + gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 @@ -804,6 +807,7 @@ mapAliases ({ libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 + libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 @@ -1055,6 +1059,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 @@ -1269,6 +1274,8 @@ mapAliases ({ pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 + pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 + pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; @@ -1469,6 +1476,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 @@ -1547,6 +1555,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 @@ -1679,6 +1688,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"; @@ -1693,6 +1703,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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7d22eeb8855..dbf6af483fa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 {}; @@ -366,6 +368,8 @@ with pkgs; buildMaven = callPackage ../build-support/build-maven.nix {}; + c64-debugger = callPackage ../applications/emulators/c64-debugger { }; + caroline = callPackage ../development/libraries/caroline { }; castget = callPackage ../applications/networking/feedreaders/castget { }; @@ -390,6 +394,8 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; + circt = callPackage ../development/compilers/circt { }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -776,6 +782,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 { }; @@ -1027,6 +1035,8 @@ with pkgs; inherit kernel firmware rootModules allowMissing; }; + mkBinaryCache = callPackage ../build-support/binary-cache { }; + mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; @@ -1244,14 +1254,13 @@ with pkgs; arc_unpacker = callPackage ../tools/archivers/arc_unpacker { boost = boost16x; # checkPhase fails with Boost 1.77 - stdenv = gcc10StdenvCompat; }; adminer = callPackage ../servers/adminer { }; akkoma = callPackage ../servers/akkoma { }; akkoma-frontends = recurseIntoAttrs { - pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { }; + akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { }; }; akkoma-emoji = recurseIntoAttrs { @@ -1367,12 +1376,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 { }; @@ -1511,10 +1530,14 @@ with pkgs; mprocs = callPackage ../tools/misc/mprocs { }; + mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; + nominatim = callPackage ../servers/nominatim { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; + paperview = callPackage ../tools/X11/paperview { }; + pferd = callPackage ../tools/misc/pferd {}; proycon-wayout = callPackage ../tools/wayland/proycon-wayout {}; @@ -1527,6 +1550,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 { }; @@ -1623,8 +1648,6 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - zq = callPackage ../development/tools/zq { }; - ### APPLICATIONS/VERSION-MANAGEMENT deepgit = callPackage ../applications/version-management/deepgit {}; @@ -1894,7 +1917,7 @@ with pkgs; git-town = callPackage ../applications/version-management/git-town { }; git-trim = callPackage ../applications/version-management/git-trim { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation; }; git-up = callPackage ../applications/version-management/git-up { @@ -2172,7 +2195,7 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; + ppsspp = callPackage ../applications/emulators/ppsspp { }; ppsspp-sdl = ppsspp; @@ -2244,6 +2267,8 @@ with pkgs; xcpc = callPackage ../applications/emulators/xcpc { }; + xemu = callPackage ../applications/emulators/xemu { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; zesarux = callPackage ../applications/emulators/zesarux { }; @@ -2261,9 +2286,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - - dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { + dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; stdenv = @@ -2438,6 +2461,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) @@ -2531,7 +2555,7 @@ with pkgs; writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; }; + iqueue = callPackage ../development/libraries/iqueue { }; lifecycled = callPackage ../tools/misc/lifecycled { }; @@ -2840,6 +2864,8 @@ with pkgs; boxes = callPackage ../tools/text/boxes { }; + boxxy = callPackage ../tools/misc/boxxy { }; + boundary = callPackage ../tools/networking/boundary { }; chamber = callPackage ../tools/admin/chamber { }; @@ -3069,6 +3095,8 @@ with pkgs; cuelsp = callPackage ../development/tools/cuelsp {}; + cyclondds = callPackage ../development/libraries/cyclondds { }; + cyclone-scheme = callPackage ../development/interpreters/cyclone { }; cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; @@ -3373,6 +3401,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pbpctrl = callPackage ../applications/audio/pbpctrl { }; + pdepend = callPackage ../development/php-packages/pdepend { }; platformsh = callPackage ../misc/platformsh { }; @@ -4389,7 +4419,7 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; dino = callPackage ../applications/networking/instant-messengers/dino { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; @@ -4530,6 +4560,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 { }; @@ -4637,6 +4669,8 @@ with pkgs; ### TOOLS/TYPESETTING/TEX + advi = callPackage ../tools/typesetting/tex/advi { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; @@ -4899,11 +4933,11 @@ with pkgs; }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -4932,6 +4966,8 @@ with pkgs; invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; + iotas = callPackage ../applications/office/iotas { }; + iotools = callPackage ../tools/misc/iotools { }; irpf = callPackage ../applications/finance/irpf { }; @@ -5123,7 +5159,9 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - meson = callPackage ../development/tools/build-managers/meson { }; + meson = callPackage ../development/tools/build-managers/meson { + inherit (darwin.apple_sdk.frameworks) Foundation OpenGL AppKit Cocoa; + }; # while building documentation meson may want to run binaries for host # which needs an emulator @@ -5359,7 +5397,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 { }; @@ -5377,8 +5417,9 @@ with pkgs; proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { }; - pueue = callPackage ../applications/misc/pueue { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; pixcat = with python3Packages; toPythonApplication pixcat; @@ -5638,6 +5679,8 @@ with pkgs; sqlint = callPackage ../development/tools/sqlint { }; + squawk = callPackage ../development/tools/squawk { }; + antibody = callPackage ../shells/zsh/antibody { }; antigen = callPackage ../shells/zsh/antigen { }; @@ -6246,6 +6289,8 @@ with pkgs; codebraid = callPackage ../tools/misc/codebraid { }; + codevis = callPackage ../tools/misc/codevis { }; + compass = callPackage ../development/tools/compass { }; cone = callPackage ../development/compilers/cone { @@ -7012,6 +7057,8 @@ with pkgs; boost = boost172; }; + enc = callPackage ../tools/security/enc { }; + endlessh = callPackage ../servers/endlessh { }; endlessh-go = callPackage ../servers/endlessh-go { }; @@ -7545,8 +7592,12 @@ with pkgs; gtk = gtk2-x11; }; + gcfflasher = callPackage ../applications/misc/gcfflasher { }; + gdmap = callPackage ../tools/system/gdmap { }; + gdtoolkit = callPackage ../development/tools/gdtoolkit { }; + gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { }; @@ -7701,6 +7752,8 @@ with pkgs; gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnu-cim = callPackage ../development/compilers/gnu-cim { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; gnuclad = callPackage ../applications/graphics/gnuclad { }; @@ -7718,11 +7771,11 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - gnupg23 = callPackage ../tools/security/gnupg/23.nix { + gnupg24 = callPackage ../tools/security/gnupg/24.nix { guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; - gnupg = gnupg23; + gnupg = gnupg24; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; @@ -7876,6 +7929,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; }; @@ -7907,6 +7962,8 @@ with pkgs; grpcurl = callPackage ../tools/networking/grpcurl { }; + grpc_cli = callPackage ../tools/networking/grpc_cli { }; + grpc-gateway = callPackage ../development/tools/grpc-gateway { }; grpcui = callPackage ../tools/networking/grpcui { }; @@ -8768,6 +8825,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 { }; @@ -8814,6 +8873,8 @@ with pkgs; kubepug = callPackage ../development/tools/kubepug { }; + kubeshark = callPackage ../applications/networking/cluster/kubeshark { }; + kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; kubo = callPackage ../applications/networking/kubo { }; @@ -9045,6 +9106,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; }; @@ -9084,17 +9147,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; @@ -9202,9 +9255,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; @@ -9492,6 +9542,8 @@ with pkgs; linuxquota = callPackage ../tools/misc/linuxquota { }; + lipl = callPackage ../tools/misc/lipl { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; lmp = callPackage ../tools/security/lmp { }; @@ -9756,7 +9808,13 @@ with pkgs; pythonPackages = python3Packages; }; - mirakurun = callPackage ../applications/video/mirakurun { }; + mirakurun = callPackage ../applications/video/mirakurun { + yarn = yarn.override { nodejs = nodejs-16_x; }; + inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { + nodejs = nodejs-16_x; + yarn = yarn.override { nodejs = nodejs-16_x; }; + }) mkYarnPackage; + }; miredo = callPackage ../tools/networking/miredo { }; @@ -9872,6 +9930,10 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + muffet = callPackage ../tools/networking/muffet { }; + + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; + multitime = callPackage ../tools/misc/multitime { }; sta = callPackage ../tools/misc/sta {}; @@ -10040,7 +10102,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; @@ -10051,9 +10113,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 { }; @@ -10063,6 +10122,8 @@ with pkgs; nfs-ganesha = callPackage ../servers/nfs-ganesha { }; + nflz = callPackage ../misc/nflz { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = callPackage ../tools/networking/ngrok { }; @@ -10310,7 +10371,11 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { + # Build currently fails on Go > 1.18 + # See https://github.com/evilsocket/opensnitch/issues/851 + buildGoModule = buildGo118Module; + }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -10346,6 +10411,8 @@ with pkgs; ombi = callPackage ../servers/ombi { }; + ome_zarr = with python3Packages; toPythonApplication ome-zarr; + omping = callPackage ../applications/networking/omping { }; onefetch = callPackage ../tools/misc/onefetch { @@ -10425,6 +10492,15 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + openrgb-with-all-plugins = openrgb.withPlugins [ + openrgb-plugin-effects + openrgb-plugin-hardwaresync + ]; + + openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { }; + + openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; + openrussian-cli = callPackage ../misc/openrussian-cli { lua = lua5_3; }; @@ -10608,6 +10684,8 @@ with pkgs; PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + paging-calculator = callPackage ../development/tools/paging-calculator { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; @@ -10765,8 +10843,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; briss = callPackage ../tools/graphics/briss { }; @@ -10791,6 +10867,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 { }; @@ -11000,6 +11078,8 @@ with pkgs; libjpeg8 = libjpeg.override { enableJpeg8 = true; }; }; + posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor {}; + postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; povray = callPackage ../tools/graphics/povray { @@ -11175,6 +11255,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + rnm = callPackage ../tools/filesystems/rnm { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { @@ -11349,6 +11431,8 @@ with pkgs; redpanda = callPackage ../servers/redpanda { }; + redpanda-server = redpanda.server; + redsocks = callPackage ../tools/networking/redsocks { }; renpy = callPackage ../development/interpreters/renpy { }; @@ -11613,7 +11697,7 @@ with pkgs; s3bro = callPackage ../tools/admin/s3bro { }; - s3fs = callPackage ../tools/filesystems/s3fs { }; + s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { }; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; @@ -11879,6 +11963,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 { }; @@ -11909,6 +11995,8 @@ with pkgs; sing-box = callPackage ../tools/networking/sing-box { }; + sing-geosite = callPackage ../data/misc/sing-geosite { }; + sipcalc = callPackage ../tools/networking/sipcalc { }; skribilo = callPackage ../tools/typesetting/skribilo { @@ -12152,6 +12240,8 @@ with pkgs; strip-nondeterminism = perlPackages.strip-nondeterminism; + structorizer = callPackage ../applications/graphics/structorizer { }; + structure-synth = callPackage ../tools/graphics/structure-synth { }; su-exec = callPackage ../tools/security/su-exec {}; @@ -12192,7 +12282,9 @@ with pkgs; sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { }; + sslscan = callPackage ../tools/security/sslscan { + openssl = openssl.override { withZlib = true; }; + }; sslmate = callPackage ../development/tools/sslmate { }; @@ -12263,6 +12355,8 @@ with pkgs; swapview = callPackage ../os-specific/linux/swapview { }; + swc = callPackage ../development/tools/swc { }; + swtpm = callPackage ../tools/security/swtpm { }; svnfs = callPackage ../tools/filesystems/svnfs { }; @@ -12645,6 +12739,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 { }; @@ -12723,6 +12819,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuckr = callPackage ../applications/misc/tuckr { }; + tuhi = callPackage ../applications/misc/tuhi { }; tuir = callPackage ../applications/misc/tuir { }; @@ -12737,6 +12835,8 @@ with pkgs; tuptime = callPackage ../tools/system/tuptime { }; + turbo = callPackage ../tools/misc/turbo { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { }; @@ -13040,6 +13140,8 @@ with pkgs; wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; + wambo = callPackage ../development/tools/wambo { }; + weather = callPackage ../applications/misc/weather { }; wego = callPackage ../applications/misc/wego { }; @@ -13055,8 +13157,7 @@ with pkgs; watchlog = callPackage ../tools/misc/watchlog { }; watchman = callPackage ../development/tools/watchman { - inherit (darwin.apple_sdk.frameworks) CoreServices; - autoconf = buildPackages.autoconf269; + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -13076,6 +13177,7 @@ with pkgs; wasmedge = callPackage ../development/tools/wasmedge { llvmPackages = llvmPackages_12; + inherit (darwin.apple_sdk.frameworks) Foundation; }; welkin = callPackage ../tools/graphics/welkin {}; @@ -13593,10 +13695,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 @@ -13614,6 +13712,8 @@ with pkgs; yamlfix = with python3Packages; toPythonApplication yamlfix; + yamlfmt = callPackage ../development/tools/yamlfmt {}; + yamllint = with python3Packages; toPythonApplication yamllint; yamlpath = callPackage ../development/tools/yamlpath { }; @@ -13709,6 +13809,8 @@ with pkgs; zplug = callPackage ../shells/zsh/zplug { }; + zps = callPackage ../tools/system/zps { }; + zi = callPackage ../shells/zsh/zi {}; zinit = callPackage ../shells/zsh/zinit {} ; @@ -13803,6 +13905,8 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; + nix-your-shell = callPackage ../shells/nix-your-shell { }; + bash = lowPrio (callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; }); @@ -14273,7 +14377,7 @@ with pkgs; num = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9 - else 11; + else 12; numS = toString num; in { gcc = pkgs.${"gcc${numS}"}; @@ -14311,7 +14415,8 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; - gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv; + # Meant for packages that fail with newer than gcc10. + gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking @@ -14774,6 +14879,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; @@ -14957,14 +15068,13 @@ with pkgs; openjdk_headless = jdk_headless; graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { - inherit (darwin.apple_sdk.frameworks) Foundation; - }); + recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; - buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { - graalvm = graalvm11-ce; - }; + buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { + graalvmDrv = graalvm-ce; + }).override; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; @@ -15233,7 +15343,7 @@ with pkgs; mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { }; mitscheme = callPackage ../development/compilers/mit-scheme - { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; + { texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { enableX11 = true; @@ -15613,13 +15723,13 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_66 = callPackage ../development/compilers/rust/1_66.nix { + rust_1_67 = callPackage ../development/compilers/rust/1_67.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_14 = llvmPackages_14.libllvm; + llvm_15 = llvmPackages_15.libllvm; # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; - rust = rust_1_66; + rust = rust_1_67; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15628,8 +15738,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_66 = rust_1_66.packages.stable; - rustPackages = rustPackages_1_66; + rustPackages_1_67 = rust_1_67.packages.stable; + rustPackages = rustPackages_1_67; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -15661,6 +15771,7 @@ with pkgs; cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15730,6 +15841,7 @@ with pkgs; openssl = openssl_1_1; }; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; + cargo-dist = callPackage ../development/tools/rust/cargo-dist { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin) DarwinTools; @@ -16875,9 +16987,7 @@ with pkgs; srelay = callPackage ../tools/networking/srelay { }; - xidel = callPackage ../tools/text/xidel { - openssl = openssl_1_1; - }; + xidel = callPackage ../tools/text/xidel { }; asdf-vm = callPackage ../tools/misc/asdf-vm { }; @@ -16895,9 +17005,7 @@ with pkgs; adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) + inherit (callPackage ../development/tools/alloy { }) alloy5 alloy6 alloy; @@ -16960,6 +17068,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 { }; @@ -16968,10 +17080,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 { }; @@ -17159,13 +17267,9 @@ with pkgs; libc = preLibcCrossHeaders; }; - libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { }; - libopcodes = callPackage ../development/tools/misc/binutils/libopcodes.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libopcodes = callPackage ../development/tools/misc/binutils/libopcodes.nix { }; # Held back 2.38 release. Remove once all dependencies are ported to 2.39. binutils-unwrapped_2_38 = callPackage ../development/tools/misc/binutils/2.38 { @@ -17497,6 +17601,7 @@ with pkgs; libgcc = callPackage ../development/libraries/gcc/libgcc { stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems + gcc = gcc11; # fails to build with gcc12 }; # This is for e.g. LLVM libraries on linux. @@ -17895,7 +18000,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 { }; @@ -18043,6 +18148,10 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; }; + listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd { + inherit (darwin.apple_sdk.frameworks) Security; + }; + lit = callPackage ../development/tools/misc/lit { }; litecli = callPackage ../development/tools/database/litecli {}; @@ -18514,6 +18623,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 { }; @@ -18766,6 +18877,8 @@ with pkgs; xcpretty = callPackage ../development/tools/xcpretty { }; + xeus = callPackage ../development/libraries/xeus { }; + xmlindent = callPackage ../development/web/xmlindent {}; xpwn = callPackage ../development/mobile/xpwn {}; @@ -19237,7 +19350,7 @@ with pkgs; cog = callPackage ../development/web/cog { }; - cosmoc = callPackage ../development/tools/cosmoc { }; + cosmocc = callPackage ../development/tools/cosmocc { }; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; @@ -19410,12 +19523,15 @@ with pkgs; eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; + stdenv = if stdenv.isDarwin then gccStdenv else stdenv; }; eclib = callPackage ../development/libraries/eclib {}; editline = callPackage ../development/libraries/editline { }; + edencommon = callPackage ../development/libraries/edencommon { }; + eigen = callPackage ../development/libraries/eigen {}; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; @@ -19490,6 +19606,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + fbthrift = callPackage ../development/libraries/fbthrift { }; + + fb303 = callPackage ../development/libraries/fb303 { }; + fcgi = callPackage ../development/libraries/fcgi { }; fcl = callPackage ../development/libraries/fcl { }; @@ -19506,30 +19626,28 @@ with pkgs; linbox = callPackage ../development/libraries/linbox { }; - ffmpeg_4-headless = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; - - sdlSupport = false; - vdpauSupport = false; - pulseaudioSupport = false; - libva = libva-minimal; - }; - ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox + VideoDecodeAcceleration VideoToolbox; }; - - ffmpeg_5-headless = callPackage ../development/libraries/ffmpeg/5.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; - - sdlSupport = false; - vdpauSupport = false; - pulseaudioSupport = false; - libva = libva-minimal; + ffmpeg_4-headless = ffmpeg_4.override { + ffmpegVariant = "headless"; + }; + ffmpeg_4-full = ffmpeg.override { + ffmpegVariant = "full"; }; ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox + VideoDecodeAcceleration VideoToolbox; + }; + ffmpeg_5-headless = ffmpeg_5.override { + ffmpegVariant = "headless"; + }; + ffmpeg_5-full = ffmpeg_5.override { + ffmpegVariant = "full"; }; # Aliases @@ -19538,26 +19656,8 @@ with pkgs; # Packages which use ffmpeg as a library, should pin to the relevant major # version number which the upstream support. ffmpeg = ffmpeg_4; - ffmpeg-headless = ffmpeg_4-headless; - - ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - svt-av1 = if stdenv.isAarch64 then null else svt-av1; - rtmpdump = null; # Prefer the built-in RTMP implementation - # The following need to be fixed on Darwin - libjack2 = if stdenv.isDarwin then null else libjack2; - libmodplug = if stdenv.isDarwin then null else libmodplug; - libmfx = if stdenv.isDarwin then null else intel-media-sdk; - libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - samba = if stdenv.isDarwin then null else samba; - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - }; - - ffmpeg_5-full = ffmpeg-full.override { - ffmpeg = ffmpeg_5; - }; + ffmpeg-full = ffmpeg_4-full; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; @@ -19569,12 +19669,15 @@ 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 {}; filtron = callPackage ../servers/filtron { }; + fizz = callPackage ../development/libraries/fizz { }; + flann = callPackage ../development/libraries/flann { }; flatcc = callPackage ../development/libraries/flatcc { }; @@ -19617,7 +19720,6 @@ with pkgs; freeimage = callPackage ../development/libraries/freeimage { inherit (darwin) autoSignDarwinBinariesHook; - libraw = libraw_unstable; }; freetts = callPackage ../development/libraries/freetts { @@ -19670,6 +19772,8 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; + function-runner = callPackage ../development/web/function-runner { }; + functionalplus = callPackage ../development/libraries/functionalplus { }; galer = callPackage ../tools/security/galer { }; @@ -20408,6 +20512,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 { }; @@ -20418,6 +20524,8 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; + irr1 = callPackage ../development/libraries/irr1 { }; + irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { @@ -20462,6 +20570,8 @@ with pkgs; jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbig2enc = callPackage ../development/libraries/jbig2enc { }; + jcal = callPackage ../development/libraries/jcal { }; jbigkit = callPackage ../development/libraries/jbigkit { }; @@ -20470,6 +20580,8 @@ with pkgs; jose = callPackage ../development/libraries/jose { }; + jpcre2 = callPackage ../development/libraries/jpcre2 { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; @@ -20561,7 +20673,7 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; lemon-graph = callPackage ../development/libraries/lemon-graph { - stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv; }; levmar = callPackage ../development/libraries/levmar { }; @@ -20848,6 +20960,8 @@ with pkgs; libdiscid = callPackage ../development/libraries/libdiscid { }; + libdisplay-info = callPackage ../development/libraries/libdisplay-info { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; @@ -22009,6 +22123,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; @@ -22590,6 +22706,8 @@ with pkgs; pkgdiff = callPackage ../tools/misc/pkgdiff { }; + pkgtop = callPackage ../tools/misc/pkgtop { }; + place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; platform-folders = callPackage ../development/libraries/platform-folders { }; @@ -22656,13 +22774,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - # https://github.com/protocolbuffers/protobuf/issues/10418 - # protobuf versions have to match between build-time and run-time - # Using "targetPlatform" in the check makes sure that the version of - # pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the - # version of pkgsCross.armv7l-hf-multiplatform.protobuf - protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else - protobuf3_21; + protobuf = protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; @@ -22941,6 +23053,8 @@ with pkgs; rover = callPackage ../development/tools/rover { }; + rqlite = callPackage ../servers/sql/rqlite { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; @@ -23014,6 +23128,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; @@ -23331,6 +23449,8 @@ with pkgs; subdl = callPackage ../applications/video/subdl { }; + subtitleedit = callPackage ../applications/video/subtitleedit { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { }; @@ -23570,7 +23690,10 @@ with pkgs; vte = callPackage ../development/libraries/vte { # Needs GCC ≥10 but aarch64 defaults to GCC 9. - stdenv = clangStdenv; + stdenv = + if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU + then clangStdenv + else stdenv; }; vte-gtk4 = vte.override { @@ -23622,6 +23745,8 @@ with pkgs; wally-cli = callPackage ../development/tools/wally-cli { }; zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; + wangle = callPackage ../development/libraries/wangle { }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { }; @@ -24241,6 +24366,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 { }; @@ -24359,7 +24486,6 @@ with pkgs; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - openssl = openssl_1_1; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; @@ -24834,6 +24960,7 @@ with pkgs; mariadb_106 mariadb_108 mariadb_109 + mariadb_1010 ; mariadb = mariadb_106; mariadb-embedded = mariadb.override { withEmbedded = true; }; @@ -25135,6 +25262,8 @@ with pkgs; reproxy = callPackage ../servers/reproxy { }; + repro-get = callPackage ../tools/package-management/repro-get { }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; @@ -25188,6 +25317,8 @@ with pkgs; shairport-sync = callPackage ../servers/shairport-sync { }; + sharing = callPackage ../servers/sharing { }; + showoff = callPackage ../servers/http/showoff {}; serfdom = callPackage ../servers/serf { }; @@ -25544,8 +25675,6 @@ with pkgs; bluez = bluez5; - inherit (python3Packages) bedup; - bolt = callPackage ../os-specific/linux/bolt { }; bpf-linker = callPackage ../development/tools/bpf-linker { }; @@ -25662,9 +25791,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 { }; @@ -25728,8 +25855,6 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; - gometer = callPackage ../applications/misc/gometer { }; - gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate { }; @@ -25773,7 +25898,7 @@ with pkgs; }; btop = callPackage ../tools/system/btop { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; nmon = callPackage ../os-specific/linux/nmon { }; @@ -26023,7 +26148,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 @@ -26042,7 +26167,6 @@ with pkgs; }; libraw = callPackage ../development/libraries/libraw { }; - libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; libraw1394 = callPackage ../development/libraries/libraw1394 { }; @@ -26158,9 +26282,9 @@ with pkgs; nsh = callPackage ../shells/nsh { }; - nushell = callPackage ../shells/nushell { - inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; - inherit (darwin.apple_sdk) sdk; + nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; nettools = if stdenv.isLinux @@ -26274,6 +26398,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 { }; @@ -26374,7 +26500,7 @@ with pkgs; pipework = callPackage ../os-specific/linux/pipework { }; - pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; }; + pktgen = callPackage ../os-specific/linux/pktgen { }; plymouth = callPackage ../os-specific/linux/plymouth { }; @@ -26550,7 +26676,7 @@ with pkgs; # break some cyclic dependencies util-linux = util-linuxMinimal; # provide a super minimal gnupg used for systemd-machined - gnupg = callPackage ../tools/security/gnupg/23.nix { + gnupg = gnupg.override { enableMinimal = true; guiSupport = false; }; @@ -26884,6 +27010,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 { }; @@ -26914,6 +27044,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 { }; @@ -27073,6 +27205,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 { }; @@ -27125,6 +27259,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 { }; @@ -27216,6 +27352,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 { }; @@ -27234,6 +27372,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 {}; @@ -27262,10 +27402,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 @@ -27298,6 +27446,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 {}; @@ -27432,6 +27582,8 @@ with pkgs; nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + nasin-nanpa = callPackage ../data/fonts/nasin-nanpa {}; + national-park-typeface = callPackage ../data/fonts/national-park { }; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; @@ -27511,6 +27663,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 { }; @@ -27579,6 +27733,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + prociono = callPackage ../data/fonts/prociono { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -27658,10 +27814,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 { }; @@ -27781,6 +27941,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; }; @@ -28040,7 +28202,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 { }; @@ -28198,7 +28360,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 { }; @@ -28737,6 +28910,8 @@ with pkgs; plugins = []; }; + denaro = callPackage ../applications/finance/denaro { }; + dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; dht = callPackage ../applications/networking/p2p/dht { }; @@ -30109,6 +30284,8 @@ with pkgs; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; popura = callPackage ../tools/networking/popura {}; @@ -30117,6 +30294,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 { }; @@ -30127,8 +30311,6 @@ with pkgs; slweb = callPackage ../applications/misc/slweb { }; - singularity = callPackage ../applications/virtualization/singularity { }; - sonixd = callPackage ../applications/audio/sonixd { }; sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; @@ -30193,7 +30375,7 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; waylock = callPackage ../applications/misc/waylock { - zig = zig_0_9; + zig = zig_0_10; }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -30299,6 +30481,16 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; }; + ikiwiki-full = ikiwiki.override { + bazaarSupport = false; # tests broken + cvsSupport = true; + docutilsSupport = true; + gitSupport = true; + mercurialSupport = true; + monotoneSupport = true; + subversionSupport = true; + }; + iksemel = callPackage ../development/libraries/iksemel { texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; @@ -30506,7 +30698,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 {}; @@ -30514,8 +30710,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 { }; @@ -30556,6 +30750,8 @@ with pkgs; khal = callPackage ../applications/misc/khal { }; + khoj = callPackage ../servers/search/khoj { }; + khard = callPackage ../applications/misc/khard { }; kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; @@ -30764,7 +30960,7 @@ with pkgs; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -31203,11 +31399,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 { }; @@ -31593,7 +31789,7 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { - jre = openjdk11; + jre = openjdk17; }; prevo = callPackage ../applications/misc/prevo { }; @@ -31610,6 +31806,8 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; + rime-cli = callPackage ../applications/office/rime-cli {}; + roxctl = callPackage ../applications/networking/cluster/roxctl { }; @@ -31747,7 +31945,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 { }; @@ -32388,7 +32588,7 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc {}; - quisk = python38Packages.callPackage ../applications/radio/quisk { }; + quisk = python39Packages.callPackage ../applications/radio/quisk { }; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; @@ -33256,6 +33456,8 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; + tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { }; + topydo = callPackage ../applications/misc/topydo {}; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -33795,7 +33997,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 { }; @@ -34678,6 +34882,8 @@ with pkgs; openrct2 = callPackage ../games/openrct2 { }; + opensearch = callPackage ../servers/search/opensearch { }; + osu-lazer = callPackage ../games/osu-lazer { }; osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { }; @@ -35620,6 +35826,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + theforceengine = callPackage ../games/theforceengine { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; tbls = callPackage ../tools/misc/tbls { }; @@ -35653,7 +35861,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 { }; @@ -35980,6 +36190,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 { }; @@ -36004,6 +36218,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 { }; @@ -36168,6 +36384,10 @@ with pkgs; n3 = callPackage ../applications/science/biology/N3 { }; + nest = callPackage ../applications/science/biology/nest { }; + + nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; neuron-mpi = neuron.override {useMpi = true; }; @@ -37751,9 +37971,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 { }; @@ -37928,6 +38146,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 { }; @@ -38032,6 +38252,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 { }; @@ -38165,6 +38393,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 { }; @@ -38243,7 +38473,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; @@ -38457,9 +38687,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 { }; @@ -38531,6 +38759,8 @@ with pkgs; yersinia = callPackage ../tools/security/yersinia { }; + yatas = callPackage ../tools/security/yatas { }; + yaxg = callPackage ../tools/graphics/yaxg {}; zap = callPackage ../tools/networking/zap { }; @@ -38671,6 +38901,8 @@ with pkgs; undaemonize = callPackage ../tools/system/undaemonize {}; + wtfis = callPackage ../tools/networking/wtfis { }; + houdini = callPackage ../applications/misc/houdini {}; openfst = callPackage ../development/libraries/openfst {}; @@ -38679,8 +38911,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 @@ -38965,6 +39198,8 @@ with pkgs; alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; + flac2all = callPackage ../applications/audio/flac2all {}; + tuner = callPackage ../applications/audio/tuner { }; locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { }; @@ -38980,4 +39215,8 @@ with pkgs; resgate = callPackage ../servers/resgate { }; oversteer = callPackage ../applications/misc/oversteer { }; + + volantes-cursors = callPackage ../data/icons/volantes-cursors { }; + + gnss-share = callPackage ../servers/gnss-share { }; } diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index cf00c3da93cf..cf9bb6e59345 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -41,7 +41,7 @@ makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spl useAppleSDKLibs = stdenv.hostPlatform.isAarch64; selectAttrs = attrs: names: - lib.listToAttrs (lib.concatMap (n: if attrs ? "${n}" then [(lib.nameValuePair n attrs."${n}")] else []) names); + lib.listToAttrs (lib.concatMap (n: lib.optionals (attrs ? "${n}") [(lib.nameValuePair n attrs."${n}")]) names); chooseLibs = ( # There are differences in which libraries are exported. Avoid evaluation @@ -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 { }; @@ -178,9 +182,12 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 - xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 - xcode_10_2 xcode_10_2_1 xcode_10_3 - xcode_11 + xcode_9_1 xcode_9_2 xcode_9_3 xcode_9_4 xcode_9_4_1 + xcode_10_1 xcode_10_2 xcode_10_2_1 xcode_10_3 + xcode_11 xcode_11_1 xcode_11_2 xcode_11_3_1 xcode_11_4 xcode_11_5 xcode_11_6 xcode_11_7 + xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 + xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 + xcode_14 xcode_14_1 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 56225b6d4241..07b221caba72 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -148,6 +148,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; @@ -169,6 +170,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 301495961e33..0e704ce26af8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/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/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 525d737b8260..f115511a1183 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/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 ]; @@ -26506,10 +26521,10 @@ let URIdb = buildPerlModule { pname = "URI-db"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz"; - hash = "sha256-xJmd6vRRZSIWAyyOMn/25tZVU56sN5CVu2mww2nvplg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.20.tar.gz"; + hash = "sha256-FMjaFawgljG445/BJFHJsTEa0LXKX5Aye9+peLfRPxQ="; }; propagatedBuildInputs = [ URINested ]; meta = { @@ -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/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 45baedbbbd65..3f1aa277de99 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,15 +57,22 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. - mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${pname}"; - passthru = { - updateScript = nix-update-script {}; - }; - meta = args.meta // { - mainProgram = args.meta.mainProgram or pname; - }; - }); + mkDerivation = origArgs: + let + args = lib.fix (lib.extends + (_: previousAttrs: { + pname = "php-${previousAttrs.pname}"; + passthru = (previousAttrs.passthru or { }) // { + updateScript = nix-update-script { }; + }; + meta = (previousAttrs.meta or { }) // { + mainProgram = previousAttrs.meta.mainProgram or previousAttrs.pname; + }; + }) + (if lib.isFunction origArgs then origArgs else (_: origArgs)) + ); + in + pkgs.stdenv.mkDerivation args; # Function to build an extension which is shipped as part of the php # source, based on the php version. @@ -411,14 +418,15 @@ 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="; - }) - ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Tests are flaky on darwin + rm ext/opcache/tests/blacklist.phpt + rm ext/opcache/tests/bug66338.phpt + rm ext/opcache/tests/bug78106.phpt + rm ext/opcache/tests/issue0115.phpt + rm ext/opcache/tests/issue0149.phpt + rm ext/opcache/tests/revalidate_path_01.phpt + ''; # Tests launch the builtin webserver. __darwinAllowLocalNetworking = true; } diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 61ed9098b919..758986390b22 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -445,6 +445,11 @@ "openssl" ] }, + "libcurl": { + "attrPath": [ + "curl" + ] + }, "libecpg": { "attrPath": [ "postgresql" diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9a09ae6663f2..b2e8033b97e4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/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 @@ -90,6 +91,7 @@ mapAliases ({ functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 + gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 GitPython = gitpython; # added 2022-10-28 @@ -101,6 +103,7 @@ mapAliases ({ grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 + hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 @@ -155,6 +158,7 @@ mapAliases ({ pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 PyICU = pyicu; # Added 2022-12-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e05400769bf8..28812e165401 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -162,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 { }; @@ -604,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 { }; @@ -849,6 +853,8 @@ self: super: with self; { awslambdaric = callPackage ../development/python-modules/awslambdaric { }; + awswrangler = callPackage ../development/python-modules/awswrangler { }; + axis = callPackage ../development/python-modules/axis { }; azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; @@ -1073,8 +1079,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 { }; @@ -1101,6 +1105,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; }; @@ -1214,12 +1220,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 { }; @@ -1294,6 +1300,8 @@ self: super: with self; { black = callPackage ../development/python-modules/black { }; + blackjax = callPackage ../development/python-modules/blackjax { }; + black-macchiato = callPackage ../development/python-modules/black-macchiato { }; bleach = callPackage ../development/python-modules/bleach { }; @@ -1413,6 +1421,8 @@ self: super: with self; { brelpy = callPackage ../development/python-modules/brelpy { }; + brian2 = callPackage ../development/python-modules/brian2 { }; + broadlink = callPackage ../development/python-modules/broadlink { }; brother = callPackage ../development/python-modules/brother { }; @@ -1473,7 +1483,7 @@ self: super: with self; { buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards badges ]); buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; @@ -1861,6 +1871,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 { }; @@ -2237,6 +2249,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 { }; @@ -2361,6 +2375,8 @@ self: super: with self; { deploykit = callPackage ../development/python-modules/deploykit { }; + deprecat = callPackage ../development/python-modules/deprecat { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; @@ -2453,6 +2469,8 @@ self: super: with self; { dissect-evidence = callPackage ../development/python-modules/dissect-evidence { }; + dissect-executable = callPackage ../development/python-modules/dissect-executable { }; + dissect-extfs = callPackage ../development/python-modules/dissect-extfs { }; dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { }; @@ -2465,6 +2483,8 @@ self: super: with self; { dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { }; + dissect-squashfs = callPackage ../development/python-modules/dissect-squashfs { }; + dissect-sql = callPackage ../development/python-modules/dissect-sql { }; dissect-target = callPackage ../development/python-modules/dissect-target { }; @@ -3283,6 +3303,8 @@ self: super: with self; { fasttext = callPackage ../development/python-modules/fasttext { }; + fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; + favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; @@ -3571,6 +3593,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 { }; @@ -3706,8 +3730,6 @@ self: super: with self; { gdown = callPackage ../development/python-modules/gdown { }; - gdtoolkit = callPackage ../development/python-modules/gdtoolkit { }; - ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule (pkgs.geant4.override { @@ -4049,6 +4071,8 @@ self: super: with self; { gql = callPackage ../development/python-modules/gql { }; + grad-cam = callPackage ../development/python-modules/grad-cam { }; + gradient = callPackage ../development/python-modules/gradient { }; gradient-utils = callPackage ../development/python-modules/gradient-utils { }; @@ -4226,8 +4250,6 @@ self: super: with self; { handout = callPackage ../development/python-modules/handout { }; - hangups = callPackage ../development/python-modules/hangups { }; - hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; @@ -4322,6 +4344,10 @@ self: super: with self; { hiro = callPackage ../development/python-modules/hiro { }; + hist = callPackage ../development/python-modules/hist { }; + + histoprint = callPackage ../development/python-modules/histoprint { }; + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; hjson = callPackage ../development/python-modules/hjson { }; @@ -4846,6 +4872,8 @@ self: super: with self; { cudaSupport = false; }; + jaxopt = callPackage ../development/python-modules/jaxopt { }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -5444,8 +5472,6 @@ self: super: with self; { lightgbm = callPackage ../development/python-modules/lightgbm { }; - lightning = callPackage ../development/python-modules/lightning { }; - lightning-utilities = callPackage ../development/python-modules/lightning-utilities { }; lightparam = callPackage ../development/python-modules/lightparam { }; @@ -5764,6 +5790,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 { }; @@ -5798,6 +5826,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 { }; @@ -6174,6 +6204,8 @@ self: super: with self; { myst-parser = callPackage ../development/python-modules/myst-parser { }; + n3fit = callPackage ../development/python-modules/n3fit { }; + nad-receiver = callPackage ../development/python-modules/nad-receiver { }; nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; @@ -6274,6 +6306,8 @@ self: super: with self; { nessclient = callPackage ../development/python-modules/nessclient { }; + nest = toPythonModule(pkgs.nest-mpi.override { withPython = true; python3 = python; }); + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nested-lookup = callPackage ../development/python-modules/nested-lookup { }; @@ -6589,6 +6623,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 { }; @@ -6694,10 +6730,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 { }; @@ -7165,6 +7202,11 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pjsua2 = (toPythonModule (pkgs.pjsip.override { + pythonSupport = true; + python3 = self.python; + })).py; + pkce = callPackage ../development/python-modules/pkce { }; pkgconfig = callPackage ../development/python-modules/pkgconfig { }; @@ -7239,6 +7281,10 @@ self: super: with self; { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyorthanc = callPackage ../development/python-modules/pyorthanc { }; + + pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; pyownet = callPackage ../development/python-modules/pyownet { }; @@ -8031,8 +8077,6 @@ self: super: with self; { pyflume = callPackage ../development/python-modules/pyflume { }; - pyflunearyou = callPackage ../development/python-modules/pyflunearyou { }; - pyfma = callPackage ../development/python-modules/pyfma { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { }; @@ -8061,6 +8105,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 { }; @@ -8280,14 +8325,10 @@ self: super: with self; { pylsqpack = callPackage ../development/python-modules/pylsqpack { }; - pyls-black = callPackage ../development/python-modules/pyls-black { }; - pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; @@ -8928,6 +8969,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 { }; @@ -8936,6 +8979,8 @@ self: super: with self; { pytap2 = callPackage ../development/python-modules/pytap2 { }; + pytapo = callPackage ../development/python-modules/pytapo { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; pyte = callPackage ../development/python-modules/pyte { }; @@ -9820,6 +9865,8 @@ self: super: with self; { rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; @@ -9910,6 +9957,8 @@ self: super: with self; { remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + remotezip = callPackage ../development/python-modules/remotezip { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; @@ -10042,6 +10091,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 { }; @@ -10068,6 +10123,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 { }; @@ -10330,6 +10387,8 @@ self: super: with self; { scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + screed = callPackage ../development/python-modules/screed { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; screenlogicpy = callPackage ../development/python-modules/screenlogicpy { }; @@ -10402,6 +10461,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 { }; @@ -10747,7 +10808,9 @@ self: super: with self; { spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { + inherit (pkgs) jq; + }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; @@ -10879,6 +10942,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 { }; @@ -11183,6 +11248,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 { }; @@ -11221,6 +11288,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 { }; @@ -11749,6 +11818,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 { }; @@ -11767,6 +11838,8 @@ self: super: with self; { types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + types-pillow = callPackage ../development/python-modules/types-pillow { }; + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; types-psutil = callPackage ../development/python-modules/types-psutil { }; @@ -11846,6 +11919,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; + uhi = callPackage ../development/python-modules/uhi { }; + ujson = callPackage ../development/python-modules/ujson { }; ukkonen = callPackage ../development/python-modules/ukkonen { }; @@ -12168,7 +12243,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 { }; @@ -12588,7 +12665,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/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 83a90a2a5e6d..a79dc31ed9dd 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -83,6 +83,8 @@ with self; with super; { doCheck = false; # circular dependency with pytest }); + wheel = callPackage ../development/python2-modules/wheel { }; + zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f8139b7dab52..6366b2f2be32 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -116,6 +116,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; + kweathercore = libsForQt5.callPackage ../development/libraries/kweathercore { }; ldutils = callPackage ../development/libraries/ldutils { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ee7e64f1ffaa..8c38800b77cb 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -39,9 +39,7 @@ let attrs: if lib.isDerivation attrs then [ attrs ] - else if lib.isAttrs attrs - then accumulateDerivations (lib.attrValues attrs) - else [] + else lib.optionals (lib.isAttrs attrs) (accumulateDerivations (lib.attrValues attrs)) ) jobList; # names of all subsets of `pkgs.haskell.packages` diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f34185722201..691f50708ace 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -24,7 +24,7 @@ let packagePython value else []); - in if res.success then res.value else [] + in lib.optionals res.success res.value ); jobs = { diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index d1bf5cf7b69e..97d5ad25f63f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -663,6 +663,16 @@ }; version = "0.10.17"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dep-selector-libgecode = { groups = ["default"]; platforms = []; @@ -1873,6 +1883,17 @@ }; version = "0.2.9"; }; + mail = { + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; + }; + version = "2.8.1"; + }; markaby = { dependencies = ["builder"]; groups = ["default"]; @@ -1945,6 +1966,16 @@ }; version = "4.11.0"; }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -2077,6 +2108,39 @@ }; version = "1.4.10"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -2088,6 +2152,17 @@ }; version = "4.0.0"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -3202,6 +3277,16 @@ }; version = "2.0.11"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + type = "gem"; + }; + version = "0.3.1"; + }; tiny_tds = { groups = ["default"]; platforms = []; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index c133e1472ebc..7cf5533da7f2 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/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; };