diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
index 3d4bb04999..5f21df834d 100644
--- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
+++ b/third_party/nixpkgs/.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/third_party/nixpkgs/doc/Makefile b/third_party/nixpkgs/doc/Makefile
index 1e54aef9bd..ee98a3ee92 100644
--- a/third_party/nixpkgs/doc/Makefile
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua b/third_party/nixpkgs/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua
deleted file mode 100644
index 8f4de40ce5..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/doc/builders/images.xml b/third_party/nixpkgs/doc/builders/images.xml
index 7d06130e3e..a4661ab5a7 100644
--- a/third_party/nixpkgs/doc/builders/images.xml
+++ b/third_party/nixpkgs/doc/builders/images.xml
@@ -11,4 +11,5 @@
+
diff --git a/third_party/nixpkgs/doc/builders/images/binarycache.section.md b/third_party/nixpkgs/doc/builders/images/binarycache.section.md
new file mode 100644
index 0000000000..fe2772f33b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/hooks/breakpoint.section.md b/third_party/nixpkgs/doc/hooks/breakpoint.section.md
index 41e50653e9..9600e06b79 100644
--- a/third_party/nixpkgs/doc/hooks/breakpoint.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md
index 6b3a369c29..707da43e9d 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md
index eecc84b4c1..fb6fee997d 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md
@@ -6,7 +6,7 @@ Nixpkgs provides a couple of facilities for working with this tool.
## Writing packages providing pkg-config modules
-Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide.
+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.
diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
index 0d159233a9..dcf173f865 100644
--- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
@@ -116,6 +116,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 +263,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 +285,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.
diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix
index d14d209a83..5e8f4ca4bb 100644
--- a/third_party/nixpkgs/lib/options.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/lib/systems/architectures.nix b/third_party/nixpkgs/lib/systems/architectures.nix
index 94127fa90b..57b9184ca6 100644
--- a/third_party/nixpkgs/lib/systems/architectures.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 857679feb5..00a92b32e2 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/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";
@@ -811,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";
@@ -926,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";
@@ -1754,7 +1766,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";
@@ -2376,6 +2388,12 @@
github = "CaptainJawZ";
githubId = 43111068;
};
+ CardboardTurkey = {
+ name = "Kiran Ostrolenk";
+ email = "kostrolenk@gmail.com";
+ github = "CardboardTurkey";
+ githubId = 34030186;
+ };
carlosdagos = {
email = "m@cdagostino.io";
github = "carlosdagos";
@@ -3124,7 +3142,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";
@@ -3403,7 +3421,7 @@
};
davsanchez = {
email = "davidslt+nixpkgs@pm.me";
- github = "davsanchez";
+ github = "DavSanchez";
githubId = 11422515;
name = "David Sánchez";
};
@@ -3849,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";
@@ -3890,6 +3914,7 @@
name = "Davide Peressoni";
email = "davide.peressoni@tuta.io";
matrix = "@dpd-:matrix.org";
+ github = "DPDmancul";
githubId = 3186857;
};
dpercy = {
@@ -4320,7 +4345,7 @@
};
elnudev = {
email = "elnu@elnu.com";
- github = "elnudev";
+ github = "ElnuDev";
githubId = 9874955;
name = "Elnu";
};
@@ -4608,7 +4633,7 @@
};
ewok = {
email = "ewok@ewok.ru";
- github = "ewok";
+ github = "ewok-old";
githubId = 454695;
name = "Artur Taranchiev";
};
@@ -5163,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";
@@ -5739,7 +5770,7 @@
};
harrisonthorne = {
email = "harrisonthorne@proton.me";
- github = "harrisonthorne";
+ github = "muni-corn";
githubId = 33523827;
name = "Harrison Thorne";
};
@@ -6974,7 +7005,7 @@
};
jkarlson = {
email = "jekarlson@gmail.com";
- github = "jkarlson";
+ github = "ethorsoe";
githubId = 1204734;
name = "Emil Karlson";
};
@@ -7752,7 +7783,7 @@
name = "Kid";
};
kidsan = {
- github = "kidsan";
+ github = "Kidsan";
githubId = 8798449;
name = "kidsan";
};
@@ -8649,6 +8680,8 @@
loveisgrief = {
name = "LoveIsGrief";
email = "loveisgrief@tuta.io";
+ github = "LoveIsGrief";
+ githubId = 2829538;
keys = [{
fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB";
}];
@@ -8800,7 +8833,7 @@
};
lux = {
email = "lux@lux.name";
- github = "luxferresum";
+ github = "luxzeitlos";
githubId = 1208273;
matrix = "@lux:ontheblueplanet.com";
name = "Lux";
@@ -9273,7 +9306,7 @@
};
maxwell-lt = {
email = "maxwell.lt@live.com";
- github = "maxwell-lt";
+ github = "Maxwell-lt";
githubId = 17859747;
name = "Maxwell L-T";
};
@@ -9912,7 +9945,7 @@
name = "Mon Aaraj";
email = "owo69uwu69@gmail.com";
matrix = "@mon:tchncs.de";
- github = "MonAaraj";
+ github = "ribosomerocker";
githubId = 46468162;
};
monsieurp = {
@@ -10161,7 +10194,7 @@
munksgaard = {
name = "Philip Munksgaard";
email = "philip@munksgaard.me";
- github = "munksgaard";
+ github = "Munksgaard";
githubId = 230613;
matrix = "@philip:matrix.munksgaard.me";
keys = [{
@@ -10496,6 +10529,12 @@
github = "nikstur";
githubId = 61635709;
};
+ nintron = {
+ email = "nintron@sent.com";
+ github = "Nintron27";
+ githubId = 47835714;
+ name = "Nintron";
+ };
ngerstle = {
name = "Nicholas Gerstle";
email = "ngerstle@gmail.com";
@@ -10778,7 +10817,7 @@
};
nrhelmi = {
email = "helmiinour@gmail.com";
- github = "nrhelmi";
+ github = "NRHelmi";
githubId = 15707703;
name = "Helmi Nour";
};
@@ -11155,7 +11194,7 @@
};
paddygord = {
email = "pgpatrickgordon@gmail.com";
- github = "paddygord";
+ github = "avaunit02";
githubId = 10776658;
name = "Patrick Gordon";
};
@@ -12205,7 +12244,7 @@
};
ratsclub = {
email = "victor@freire.dev.br";
- github = "vtrf";
+ github = "ratsclub";
githubId = 25647735;
name = "Victor Freire";
};
@@ -12469,7 +12508,7 @@
};
rika = {
email = "rika@paymentswit.ch";
- github = "NekomimiScience";
+ github = "ScarletHg";
githubId = 1810487;
name = "Rika";
};
@@ -12815,6 +12854,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";
@@ -13464,7 +13509,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";
@@ -13702,7 +13747,7 @@
sno2wman = {
name = "SnO2WMaN";
email = "me@sno2wman.net";
- github = "sno2wman";
+ github = "SnO2WMaN";
githubId = 15155608;
};
snpschaaf = {
@@ -14428,6 +14473,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";
@@ -14450,7 +14501,7 @@
};
teozkr = {
email = "teo@nullable.se";
- github = "teozkr";
+ github = "nightkr";
githubId = 649832;
name = "Teo Klestrup Röijezon";
};
@@ -14864,7 +14915,7 @@
};
toastal = {
email = "toastal+nix@posteo.net";
- matrix = "@toastal:matrix.org";
+ matrix = "@toastal:chat.mozilla.org";
github = "toastal";
githubId = 561087;
name = "toastal";
@@ -14937,7 +14988,7 @@
};
tonyshkurenko = {
email = "support@twingate.com";
- github = "tonyshkurenko";
+ github = "antonshkurenko";
githubId = 8597964;
name = "Anton Shkurenko";
};
@@ -15276,7 +15327,7 @@
};
uthar = {
email = "galkowskikasper@gmail.com";
- github = "uthar";
+ github = "Uthar";
githubId = 15697697;
name = "Kasper Gałkowski";
};
@@ -16108,6 +16159,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";
@@ -16400,7 +16457,7 @@
zebreus = {
matrix = "@lennart:cicen.net";
email = "lennarteichhorn+nixpkgs@gmail.com";
- github = "Zebreus";
+ github = "zebreus";
githubId = 1557253;
name = "Lennart Eichhorn";
};
@@ -16466,7 +16523,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/third_party/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix b/third_party/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix
index 08c6bc4c96..d650e82f8b 100644
--- a/third_party/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 49ddf1f10b..4d338675c6 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md
index 3395ace20c..2eff153879 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md
index 4dd1b203a2..d8c9dea6c3 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/sshfs-file-systems.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md
index be185cf4c3..bef35f4488 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md
index 60771b36fa..a80be2b523 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md
+++ b/third_party/nixpkgs/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
diff --git a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md
index 5575998092..c306cc084c 100644
--- a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix
index 9dab1738ab..e0bcec1ea6 100644
--- a/third_party/nixpkgs/nixos/doc/manual/default.nix
+++ b/third_party/nixpkgs/nixos/doc/manual/default.nix
@@ -68,12 +68,34 @@ let
optionIdPrefix = "test-opt-";
};
- sources = lib.sourceFilesBySuffices ./. [".xml"];
+ sources = runCommand "manual-sources" {
+ inputs = lib.sourceFilesBySuffices ./. [ ".xml" ".md" ];
+ nativeBuildInputs = [ pkgs.nixos-render-docs ];
+ } ''
+ mkdir $out
+ cd $out
+ cp -r --no-preserve=all $inputs/* .
+
+ declare -a convert_args
+ while read -r mf; do
+ if [[ "$mf" = *.chapter.md ]]; then
+ convert_args+=("--chapter")
+ else
+ convert_args+=("--section")
+ fi
+
+ convert_args+=("from_md/''${mf%.md}.xml" "$mf")
+ done < <(find . -type f -name '*.md')
+
+ nixos-render-docs manual docbook-fragment \
+ --manpage-urls ${manpageUrls} \
+ "''${convert_args[@]}"
+ '';
modulesDoc = runCommand "modules.xml" {
nativeBuildInputs = [ pkgs.nixos-render-docs ];
} ''
- nixos-render-docs manual docbook \
+ nixos-render-docs manual docbook-section \
--manpage-urls ${manpageUrls} \
"$out" \
--section \
@@ -255,8 +277,7 @@ in rec {
# Generate the NixOS manpages.
manpages = runCommand "nixos-manpages"
- { inherit sources;
- nativeBuildInputs = [
+ { nativeBuildInputs = [
buildPackages.installShellFiles
] ++ lib.optionals allowDocBook [
buildPackages.libxml2.bin
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md b/third_party/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md
index 10e876b96d..514a06f97e 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/freeform-modules.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md
index 18ec7ba903..59470bf1bc 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/development/option-def.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-def.section.md
index 22cf38873c..6a3dc26b99 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/option-def.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md
index 0e9c4a4d16..51977c5833 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md
index 334149d021..476ba4b03f 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md
index fa24679b7f..a0ec4a5df9 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.chapter.md
+++ b/third_party/nixpkgs/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, ... }:
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md
index 5bcdf6e58e..d80e314e62 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md
+++ b/third_party/nixpkgs/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
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/README.md b/third_party/nixpkgs/nixos/doc/manual/from_md/README.md
deleted file mode 100644
index cc6d08ca0a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/boot-problems.section.xml
deleted file mode 100644
index 144661c86e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml
deleted file mode 100644
index 35dfaf30f4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/container-networking.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/container-networking.section.xml
deleted file mode 100644
index a64053cdfa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/containers.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/containers.chapter.xml
deleted file mode 100644
index afbd5b35aa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/control-groups.chapter.xml
deleted file mode 100644
index f78c058780..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/declarative-containers.section.xml
deleted file mode 100644
index efc3432ba1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/imperative-containers.section.xml
deleted file mode 100644
index 865fc46893..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/logging.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/logging.chapter.xml
deleted file mode 100644
index 4da38c065a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml
deleted file mode 100644
index c86b1911c1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/network-problems.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/network-problems.section.xml
deleted file mode 100644
index 4c0598ca94..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/rebooting.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/rebooting.chapter.xml
deleted file mode 100644
index 78ee75afb6..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/rollback.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/rollback.section.xml
deleted file mode 100644
index a8df053011..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml
deleted file mode 100644
index 3b7bd6cd30..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/store-corruption.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/store-corruption.section.xml
deleted file mode 100644
index 9ed572d484..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml
deleted file mode 100644
index 8bbb8a1fe7..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml
deleted file mode 100644
index e8c64f153f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/abstractions.section.xml
deleted file mode 100644
index 469e85979e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml
deleted file mode 100644
index 516022dc16..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml
deleted file mode 100644
index c9a8d4f3f1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml
deleted file mode 100644
index b1a1a8df32..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml
deleted file mode 100644
index da5419cde4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml
deleted file mode 100644
index baf9639554..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml
deleted file mode 100644
index 8026c4102b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml
deleted file mode 100644
index bee310c2e3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml
deleted file mode 100644
index e5285c7975..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/firewall.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/firewall.section.xml
deleted file mode 100644
index 6e1ffab72c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml
deleted file mode 100644
index c95d3dc865..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml
deleted file mode 100644
index 49ec6f5952..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml
deleted file mode 100644
index 2adb106226..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml
deleted file mode 100644
index da9ba323f1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml
deleted file mode 100644
index f889306d51..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml
deleted file mode 100644
index 144a5aceca..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/modularity.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/modularity.section.xml
deleted file mode 100644
index 987b2fc43c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/network-manager.section.xml
deleted file mode 100644
index c49618b4b9..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/networking.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/networking.chapter.xml
deleted file mode 100644
index 2ed86ea3b5..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml
deleted file mode 100644
index d3727edbe0..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles.chapter.xml
deleted file mode 100644
index f3aacfc0a2..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml
deleted file mode 100644
index 43ac5edea7..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/base.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/base.section.xml
deleted file mode 100644
index 83d35bd286..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml
deleted file mode 100644
index 9430b49ea3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml
deleted file mode 100644
index 09c2680a10..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml
deleted file mode 100644
index 97c2a92dca..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml
deleted file mode 100644
index 1b109519d4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml
deleted file mode 100644
index 1fd5a91798..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml
deleted file mode 100644
index 0910b9ffaa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml
deleted file mode 100644
index 837e69df06..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml
deleted file mode 100644
index a3fe30357d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml
deleted file mode 100644
index f33464f9db..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml
deleted file mode 100644
index fca99edcba..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ssh.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/ssh.section.xml
deleted file mode 100644
index e0d4031443..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml
deleted file mode 100644
index 26984dd411..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/subversion.chapter.xml
deleted file mode 100644
index 4390fc54ab..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml
deleted file mode 100644
index d61b248d5e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/wayland.chapter.xml
deleted file mode 100644
index 07892c875b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/wireless.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/wireless.section.xml
deleted file mode 100644
index 79feab4720..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml
deleted file mode 100644
index 319d3e9801..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml
deleted file mode 100644
index 22a5d9875f..0000000000
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/xfce.chapter.xml
+++ /dev/null
@@ -1,70 +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
-
-
- It is necessary to log out and log in again for this to take
- effect.
-
-
-
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml
deleted file mode 100644
index 99dc5ce30b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/activation-script.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/activation-script.section.xml
deleted file mode 100644
index 429b45c93d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/assertions.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/assertions.section.xml
deleted file mode 100644
index 13f04d5d18..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/bootspec.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/bootspec.chapter.xml
deleted file mode 100644
index 9ecbe1d1be..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-parts.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/building-parts.chapter.xml
deleted file mode 100644
index 4df24cc956..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/freeform-modules.section.xml
deleted file mode 100644
index c51bc76ff9..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/importing-modules.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/importing-modules.section.xml
deleted file mode 100644
index 96e5e1bb16..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml
deleted file mode 100644
index 666bbec616..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml
deleted file mode 100644
index 64234f1cc0..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml
deleted file mode 100644
index b9ff226967..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml
deleted file mode 100644
index af05e61363..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-def.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-def.section.xml
deleted file mode 100644
index 87b290ec39..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml
deleted file mode 100644
index 363399b086..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/replace-modules.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/replace-modules.section.xml
deleted file mode 100644
index d8aaf59df3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
deleted file mode 100644
index 30aa24f26e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml
deleted file mode 100644
index 23abb54689..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml
deleted file mode 100644
index 898cd3b2b6..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/sources.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/sources.chapter.xml
deleted file mode 100644
index aac18c9d06..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/testing-installer.chapter.xml
deleted file mode 100644
index 286d49f3c2..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml
deleted file mode 100644
index 4c980e1213..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml
deleted file mode 100644
index 66ba792dda..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml
deleted file mode 100644
index 0d8a33df20..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-modules.chapter.xml
deleted file mode 100644
index 35e94845c9..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml
deleted file mode 100644
index 308f7c6fb0..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml
deleted file mode 100644
index 0e46c1d48c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/changing-config.chapter.xml
deleted file mode 100644
index 727c61c45d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml
deleted file mode 100644
index 00b4e87667..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
deleted file mode 100644
index 5f18d528d3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-kexec.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-kexec.section.xml
deleted file mode 100644
index 40a697c740..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-pxe.section.xml
deleted file mode 100644
index 94172de65e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-usb.section.xml
deleted file mode 100644
index cb0fd95bc7..0000000000
--- a/third_party/nixpkgs/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 rawrdiskX 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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml
deleted file mode 100644
index e435081852..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml
deleted file mode 100644
index 5654eb424f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/obtaining.chapter.xml
deleted file mode 100644
index d187adfc0c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/upgrading.chapter.xml
deleted file mode 100644
index 99882784b4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml
deleted file mode 100644
index b4f3657b4b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml
deleted file mode 100644
index 5686545c1a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml
deleted file mode 100644
index ccaa4f6bd0..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml
deleted file mode 100644
index 96b51a0510..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml
deleted file mode 100644
index 25b356e0aa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml
deleted file mode 100644
index c2adbc88f5..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml
deleted file mode 100644
index 8667063f37..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml
deleted file mode 100644
index 849ec868c7..0000000000
--- a/third_party/nixpkgs/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
- kvmand 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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml
deleted file mode 100644
index f197c52906..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml
deleted file mode 100644
index 4bbfa7be39..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml
deleted file mode 100644
index ed26f2ba45..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml
deleted file mode 100644
index 3bf83e1ecc..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml
deleted file mode 100644
index 35fbb7447c..0000000000
--- a/third_party/nixpkgs/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-unstableafter
- 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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
deleted file mode 100644
index a1b007e711..0000000000
--- a/third_party/nixpkgs/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.
-
-
-
-
- buildGoModuledoCheck
- 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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
deleted file mode 100644
index 868c170987..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
deleted file mode 100644
index 48a7179165..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
deleted file mode 100644
index 64217c53c3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
deleted file mode 100644
index 2d7226caa5..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
deleted file mode 100644
index 6936fdd260..0000000000
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ /dev/null
@@ -1,1028 +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 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.
-
-
-
-
- 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.
-
-
-
-
-
- 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.
-
-
-
-
- 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.
-
-
-
-
- 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
- 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.
-
-
-
-
- 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
- libshare 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.
-
-
-
-
- Nebula now supports the
- services.nebula.networks.<name>.isRelay
- and
- services.nebula.networks.<name>.relays
- configuration options for setting up or allowing traffic
- relaying. See the
- announcement
- for more details about relays.
-
-
-
-
- hip has been separated into
- 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 zramSwap is now implemented with
- zram-generator, and the option
- zramSwap.numDevices for using ZRAM devices
- as general purpose ephemeral block devices has been removed.
-
-
-
-
- As Singularity has renamed to
- Apptainer
- to distinguish from
- an
- un-renamed fork by Sylabs Inc., there are now two
- packages of Singularity/Apptainer:
-
-
-
-
- apptainer: From
- github.com/apptainer/apptainer, which
- is the new repo after renaming.
-
-
-
-
- singularity: From
- github.com/sylabs/singularity, which is
- the fork by Sylabs Inc..
-
-
-
-
- programs.singularity got a new
- package option to specify which package to
- use.
-
-
- singularity-tools.buildImage got a new
- input argument singularity to specify which
- package to use.
-
-
-
-
- The new option
- programs.singularity.enableFakeroot, if set
- to true, provides
- --fakeroot support for
- apptainer and
- singularity.
-
-
-
-
- The unifi-poller package and corresponding
- 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.
-
-
-
-
- tvbrowser-bin was removed, and now
- tvbrowser is built from source.
-
-
-
-
- nixos-version now accepts
- --configuration-revision to display more
- information about the current generation revision
-
-
-
-
- The option
- services.nomad.extraSettingsPlugins has
- been fixed to allow more than one plugin in the path.
-
-
-
-
- The option
- services.prometheus.exporters.pihole.interval
- does not exist anymore and has been removed.
-
-
-
-
-
diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md
index ac7cf5a7bf..e1908017a7 100644
--- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md
+++ b/third_party/nixpkgs/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 = [
diff --git a/third_party/nixpkgs/nixos/doc/manual/manual.xml b/third_party/nixpkgs/nixos/doc/manual/manual.xml
index 158b3507a5..4440f8e04b 100644
--- a/third_party/nixpkgs/nixos/doc/manual/manual.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/manual.xml
@@ -12,13 +12,12 @@
-
+ Configuration Options
-
diff --git a/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh b/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh
deleted file mode 100755
index 4698e94f50..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
index b7614c0788..460d03b6c6 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -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,6 +34,10 @@ 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).
@@ -62,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.
@@ -97,6 +105,8 @@ 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.
@@ -223,6 +233,8 @@ 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)
diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
index e18003c0d4..9a83b2973b 100644
--- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
+++ b/third_party/nixpkgs/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; };
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 7a818f11ee..9ce78c9eb1 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -860,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
@@ -1047,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
@@ -1307,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
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix b/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix
index 811b81030e..b74cc3f9c0 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix b/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix
index 04dd20b5f1..1f4a39765c 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix
index d5c71bb821..c53dbf4777 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix
index 15f0f0cc0c..f579c2529c 100644
--- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix b/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix
index 62064b5d90..53638ded29 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix
index f0cb5cc151..2d0d91f959 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix b/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix
index 20cfebb799..c68ceab961 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix
index f13457fcde..ecc158f815 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/imaginary.nix b/third_party/nixpkgs/nixos/modules/services/networking/imaginary.nix
new file mode 100644
index 0000000000..5437da5727
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix
index 549f1fe5de..d0de6cd4fd 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
index 1d6556f626..b08f1015e8 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix b/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix
new file mode 100644
index 0000000000..df699b5674
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix
index c91ff3e69a..ee57ec8bf8 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.md b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.md
index fc849be0c8..5419940a68 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix
index fc482ff32d..8d17752586 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
index 2153720836..c85109b147 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/third_party/nixpkgs/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 = { ... }: {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index 50c2d68c77..c5e161c251 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix
index 79ed3e43dd..6a8a28185b 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/third_party/nixpkgs/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
@@ -284,6 +287,8 @@ in
group = "onlyoffice";
isSystemUser = true;
};
+
+ nginx.extraGroups = [ "onlyoffice" ];
};
users.groups.onlyoffice = { };
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 181db01ad8..ab666ba394 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -90,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.";
};
@@ -316,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 = [
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
index 620d76aef2..70edc13dc0 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix
new file mode 100644
index 0000000000..33f1b247c5
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix
@@ -0,0 +1,101 @@
+{ config, pkgs, lib, ... }:
+
+let
+ cfg = 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 a boot time in the initrd.
+ systemd-repart only works with GPT partition tables.
+ '';
+ };
+
+ 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 {
+ # Link the definitions into /etc so that they are included in the
+ # /nix/store of the sysroot. This also allows the user to run the
+ # systemd-repart binary after activation manually while automatically
+ # picking up the definition files.
+ environment.etc."repart.d".source = definitionsDirectory;
+
+ boot.initrd.systemd = {
+ additionalUpstreamUnits = [
+ "systemd-repart.service"
+ ];
+
+ storePaths = [
+ "${config.boot.initrd.systemd.package}/bin/systemd-repart"
+ ];
+
+ # Override defaults in upstream unit.
+ services.systemd-repart = {
+ # Unset the coniditions 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" ];
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/linode-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/linode-config.nix
index d664e8269f..bbf81bda9c 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/linode-config.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
index 6c00fabaa1..2e2190e418 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
@@ -7,7 +7,10 @@ let
podmanPackage = (pkgs.podman.override {
extraPackages = cfg.extraPackages
- ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
+ # setuid shadow
+ ++ [ "/run/wrappers" ]
+ # include pkgs.zfs by default in the wrapped podman used by the module so it is cached
+ ++ (if (builtins.elem "zfs" config.boot.supportedFilesystems) then [ config.boot.zfs.package ] else [ pkgs.zfs ]);
});
# Provides a fake "docker" binary mapping to podman
@@ -181,10 +184,6 @@ in
systemd.packages = [ cfg.package ];
- systemd.services.podman.serviceConfig = {
- ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
- };
-
systemd.services.podman-prune = {
description = "Prune podman resources";
@@ -205,10 +204,6 @@ in
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
- systemd.user.services.podman.serviceConfig = {
- ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
- };
-
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
systemd.tmpfiles.packages = [
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 1af7456fad..86dd096afc 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/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 {};
@@ -489,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 {};
@@ -665,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/third_party/nixpkgs/nixos/tests/binary-cache.nix b/third_party/nixpkgs/nixos/tests/binary-cache.nix
new file mode 100644
index 0000000000..0809e59e5a
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/envoy.nix b/third_party/nixpkgs/nixos/tests/envoy.nix
index 9d2c32ce10..1e4bfe6263 100644
--- a/third_party/nixpkgs/nixos/tests/envoy.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/k3s/default.nix b/third_party/nixpkgs/nixos/tests/k3s/default.nix
index 07d93c41c7..e168f8233c 100644
--- a/third_party/nixpkgs/nixos/tests/k3s/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix
index 9a6c7fd465..932b4639b3 100644
--- a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/k3s/single-node.nix b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix
index a95fa4a031..c120f461dd 100644
--- a/third_party/nixpkgs/nixos/tests/k3s/single-node.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/opensearch.nix b/third_party/nixpkgs/nixos/tests/opensearch.nix
new file mode 100644
index 0000000000..c0caf950cb
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix b/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix
index 08773120bc..684df9c392 100644
--- a/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix b/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix
index 9ee2d280fb..055ae7d168 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/systemd-repart.nix b/third_party/nixpkgs/nixos/tests/systemd-repart.nix
new file mode 100644
index 0000000000..92cc1fb04e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/systemd-repart.nix
@@ -0,0 +1,108 @@
+{ 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";
+ };
+ };
+
+ boot.initrd.systemd.enable = true;
+ boot.initrd.systemd.repart.enable = true;
+
+ # 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.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
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix b/third_party/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix
index 55ad582d40..c979f0e0c8 100644
--- a/third_party/nixpkgs/nixos/tests/wireguard/snakeoil-keys.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/aether-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aether-lv2/default.nix
index e912c7fa49..179c656968 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/aether-lv2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix
index 6c48c756ab..7fc921e59f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/calf/default.nix b/third_party/nixpkgs/pkgs/applications/audio/calf/default.nix
index 4ab651e3fb..b4c9781ced 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/calf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix
index 2c59068720..7164cb5fd3 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
index be6e0fcca2..2350bde0bd 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/flac2all/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flac2all/default.nix
new file mode 100644
index 0000000000..e0681b94f6
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix b/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix
index 0f15775b38..f0bb039a79 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
index cf5ac3f8c5..e084002207 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix
index 7471a0afb4..f5b2cf5576 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gtkcord4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
index 5e8747f765..847096c388 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
index 684f074b4e..78891967fa 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix
index 420c11562e..8cf55289b2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
index 70cb4d7f11..36b6345c0f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix
new file mode 100644
index 0000000000..04216bdf09
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
index dd00bd1f2c..4e4612ef92 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mimic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mimic/default.nix
index 7e11c0a8d7..47e043f5d4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mimic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
index 5a229f0ae3..ccbe14d767 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
index 29f28203e1..3eb2cf20ee 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix
index 0d10b55d32..470d5c1050 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/odin2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/odin2/default.nix
index beb1264679..de89f9aede 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/odin2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
index 0860501c87..71fc1f103b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/update.sh b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/update.sh
deleted file mode 100755
index 30f1b4c293..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix
index f86595361b..47d7a64e3c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/opusfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
index 10eede334c..a00f60e732 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
- version = "6.3.06";
+ version = "6.3.08";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
- sha256 = "sha256-KwJ8ia1yQmmG+N44ipvGCbuoR2cL03STSTKzUwlDqms=";
+ sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo=";
};
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
index 542e47cd16..57a6bff6e2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix
index 38110df291..d7b15ba048 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 2c821ec6b4..a0a17a93e1 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix b/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix
index 84376a1bbe..2b72664347 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix
index e7b92b268a..59f927443b 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix
index 99fe1595de..a07a0ea1e2 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix
index a39cbc341e..80fa1e9458 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
index 4b786168bc..657e5b0e3f 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix
@@ -6,20 +6,20 @@
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=";
};
web = buildNpmPackage {
pname = "${pname}-frontend";
inherit version;
src = "${src}/web";
- npmDepsHash = "sha256-8mUfTFzPjQlQvhC3zZf+WruDBkYnmGt3yckNi0CPWs0=";
+ npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM=";
# copied from upstream Dockerfile
npmInstallFlags = [ "--legacy-peer-deps" ];
@@ -29,14 +29,14 @@ let
# override npmInstallHook, we only care about the build/ directory
installPhase = ''
mkdir $out
- cp -r build $out/
+ cp -r build/* $out/
'';
};
in
buildGoModule rec {
inherit pname version src;
- vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs=";
+ vendorHash = "sha256-bvisI589Gq9IdyJEqI+uzs3iDPOTUkq95P3n/KoFhF0=";
subPackages = [ "cmd/torq" ];
@@ -47,7 +47,8 @@ buildGoModule rec {
];
postInstall = ''
- ln -s ${web} $out/web
+ mkdir -p $out/web/build
+ cp -r ${web}/* $out/web/build/
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
index 5c2a6d7c59..53f004c2a3 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index 494a02f304..664199553d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
index 7af47c4648..f7af762069 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
index 4ae432b946..7cbb440491 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix
index f5ed28cedf..b7b70eb501 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index d3c3d58908..6ce924adf1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
index feed7ba5b4..499da2a8f9 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix
index 8f4bcfd672..fba050a040 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
index 0e0eb4b22d..4f601a56f8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
@@ -1,13 +1,13 @@
{
- "version": "3.144.3",
+ "version": "3.148.0",
"appimage": {
"x86_64-linux": {
- "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-x86_64.AppImage",
- "hash": "sha512-NHuabqi8pjCnSI6EwhPLgWjyytW/ZnGvGCjb/hXscRVcJgJiQZ7FNZnnepFtZ3c0z0F4bM6AYcH+eWmt0ySgXw=="
+ "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.144.3/standard-notes-3.144.3-linux-arm64.AppImage",
- "hash": "sha512-EaCq/0IgrSPWCkWtOBzMISfuajgGZKborPO4SoWi2QgMmwZXgLc/RBCVzVBT9C2EQLmc506IVrjOdAzkuQM5TQ=="
+ "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/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix
index e52d95f837..82dd13920b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
index 343d6936c0..0be4c3eb90 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/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-05";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "43433aa8dad1601acf923d3c25fa3325799508aa";
- sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci";
+ rev = "e48b140fb9132cc26cc82c7464e473b8f0af65db";
+ sha256 = "17wkfx268j2lpwirw70fb6j4x8b96j9zsv36d3sbcz7dw1d68xqq";
};
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-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33";
- sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11";
+ 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-14";
src = fetchFromGitHub {
owner = "goolord";
repo = "alpha-nvim";
- rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb";
- sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq";
+ rev = "d35b99e36e32040ba06c48a25b5bd3e75be2a566";
+ sha256 = "0x61xqxpb9wjvzmgb685xyfqsv6dfylh1f6px53xwz6ps5m1k36g";
};
meta.homepage = "https://github.com/goolord/alpha-nvim/";
};
@@ -727,12 +727,12 @@ final: prev:
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
- version = "2023-02-04";
+ version = "2023-02-09";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
- rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e";
- sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc";
+ rev = "624d065f1c3f88438839dba79b995bc858a4642a";
+ sha256 = "01y84kzfjnjrd34m9j9gx5d0gj7sd2vby5vmpiddh9skz8pb26f6";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
@@ -775,12 +775,12 @@ 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/";
};
@@ -847,24 +847,24 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
- version = "2023-01-30";
+ version = "2023-02-09";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812";
- sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh";
+ rev = "2d53f49c21327da48f0447841027848f49e1fea4";
+ sha256 = "1fm845zjw08pzcql7ikk8qz87wrffl4w2jwgqvrqx5207qlafcbn";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
- version = "2023-02-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
- rev = "572e4070d1f26ce7252570823598a656e828a9ec";
- sha256 = "0k8mh345m8xxmss04zwscmpyfwxsa8pwd8pjklgv8njgxr5hk1hr";
+ rev = "234ab8b8afec9139819416fc6ed5637e491a067c";
+ sha256 = "1gs7hz29l0zhrrz8ylchspfd7kqyp8j95fy17v311vgbhr1wzg6w";
};
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/";
};
@@ -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,12 +1231,12 @@ 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/";
};
@@ -1315,12 +1315,12 @@ final: prev:
cmp-dictionary = buildVimPluginFrom2Nix {
pname = "cmp-dictionary";
- version = "2023-02-04";
+ version = "2023-02-09";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "cmp-dictionary";
- rev = "5662ec89119c49a806b77b5df7517017abe47f8e";
- sha256 = "0md3msnkyw2dgkpgp12iskrdv7p4sywmdg4ifdmbcl56qn1dv5zr";
+ rev = "26522d209f5661c94f3a8bad8145160983d2252b";
+ sha256 = "12iqfbcrwh2bq9p8pxv7fwivfb07jvrvhqwal1kydfhwhzfxiswl";
};
meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
};
@@ -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-04";
+ version = "2023-02-16";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef";
- sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw";
+ rev = "567cd6f8a350475dde4523328913c70d99d153a5";
+ sha256 = "0mi9h05g8907i9vaknbvy0d696rxrsk6gw4ssas7k761ailx9pv2";
};
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-13";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "eab2c83a0207369900e92783f56990808082eac2";
- sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd";
+ rev = "418d3117dab2f54c4340ea73e0070dd78fc81753";
+ sha256 = "0qmkj4xchl3q26pzf6x8ssm97ax72vav4jcq4410mf7xiahwcl1d";
};
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-13";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
- rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683";
- sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr";
+ rev = "137df557486f91627b8e4708a47088f36950f12c";
+ sha256 = "1ipcmmp3df5dfxjaryxkwl2k48kkzxhn9hn428w76xhfa1z603iq";
};
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-04";
+ version = "2023-02-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919";
- sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8";
+ 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-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "d69d20170e12a20fa305e90870d6016e636cc328";
- sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8";
+ rev = "ce0dbf6e7e5d94d6c2df250fb61f722c0d05b041";
+ sha256 = "1w434kva86bynhkjg52jxhzcbbjlxbhkbb2sxi4z7gcns27bx7rx";
};
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-06";
src = fetchFromGitHub {
owner = "j-hui";
repo = "fidget.nvim";
- rev = "44585a0c0085765195e6961c15529ba6c5a2a13b";
- sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l";
+ rev = "9dc6d15fdb877b2fb09ea0ba2dfde9beccb5965a";
+ sha256 = "1xgb6ichs52qlzks3rlwx1v03q1yh2phl9papwd0h71mmns0plb1";
};
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-09";
src = fetchFromGitHub {
owner = "glacambre";
repo = "firenvim";
- rev = "35b34ba566d9d9f6761cde3574f668d505c5137f";
- sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm";
+ rev = "2ff7e2df6b1ffe8935d24ae90f5c173ea4cd8b1b";
+ sha256 = "049jfhbbn899xahidgx2qwca98140wiymw678x6930b0cvf16w0r";
};
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-16";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
- rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1";
- sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f";
+ rev = "1f9824bba0cdcae491f911d0d6d1281fb5685782";
+ sha256 = "0640dza1ipmwsgmh2bwqsyib7yn7c7y8ma5ki9842c6qdcah6sci";
};
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-15";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "ec4742a7eebf68bec663041d359b95637242b5c3";
- sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz";
+ rev = "5f1451ea7d9a9005b3f0bedeab20cef7a4c65993";
+ sha256 = "1x5ab50i69dwndkbl9b1ng29pagl2wyj8f4sg7p8w7djq3l9k5bb";
};
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-15";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
- rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2";
- sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa";
+ rev = "819a29a463accc0981d996e704af1a892fa0d897";
+ sha256 = "14sc9c2jhda0xf4n5nbzmv7lwgs5c632i9i2g00cakwa7m8af8s8";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.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/";
};
@@ -3886,12 +3886,12 @@ final: prev:
indent-o-matic = buildVimPluginFrom2Nix {
pname = "indent-o-matic";
- version = "2023-01-24";
+ version = "2023-02-13";
src = fetchFromGitHub {
owner = "Darazaki";
repo = "indent-o-matic";
- rev = "3103dde7a47f2855097558ab52162bbbdbe8dc40";
- sha256 = "1nfwzqki00x5vv75iawyky122v68qcajihfcdqxixlqln3srrmi4";
+ rev = "f4138581fe4575b720eae2d123cbaed0d86c94cf";
+ sha256 = "1n4vdpfhy8lga2d508ixi7mwa12rd8zk37ms43d4vrjff0v35nd5";
};
meta.homepage = "https://github.com/Darazaki/indent-o-matic/";
};
@@ -4175,12 +4175,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
- version = "2023-02-01";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
- rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693";
- sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd";
+ rev = "e916f41df26e33b01f1b3ebe28881090da3a7281";
+ sha256 = "0dxq6nfr51abn0g7igljsj78yk672c1r85givkfyb9z0a97gxmq5";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@@ -4235,24 +4235,24 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
- version = "2023-02-04";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
- rev = "f565a9c4d92245d8b619235bebeaa73cc38aa40e";
- sha256 = "1i40bi18wn7vg6mdcg0xp5zxk960lzj4kzda3syj51sv1pgdq802";
+ rev = "a2e57b7f8cfd01bb8bfb5abadf5e99acb9559700";
+ sha256 = "04srn77salnn98p44nf9ydgbk9f6vlg2jychky9pd5gqx6fkbgk2";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
- version = "2023-01-06";
+ version = "2023-02-13";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
- rev = "3008ed68c8f309ced07587684c8af53884791d35";
- sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z";
+ rev = "3cf37f4f958e47b3c124d45a5e8b654e18380035";
+ sha256 = "13cjsbv9k2rkqs51n178cw47qhcwh1w4myafchasngbyh0y4ygww";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@@ -4271,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/";
};
@@ -4319,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/";
};
@@ -4427,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/";
};
@@ -4547,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/";
};
@@ -4583,12 +4583,12 @@ final: prev:
lsp-zero-nvim = buildVimPluginFrom2Nix {
pname = "lsp-zero.nvim";
- version = "2023-01-31";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "lsp-zero.nvim";
- rev = "42bc5a1081666098a7154532e6ff5e3edc483b39";
- sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck";
+ rev = "d6af8aebb8b64877323f859d842eabdd79d021c3";
+ sha256 = "064j8n94182f8c4m7wnal9rbr05pkzr5k8rhnaqzgfhcnsdlc7ih";
};
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
};
@@ -4678,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/";
@@ -4763,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/";
};
@@ -4787,12 +4787,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
- version = "2023-02-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
- rev = "9ec92c1945b11ba7e7e6730fd60fd44525f24a25";
- sha256 = "0snf7j4x4cmwrw81bwm3fj8k07l8iriqwzc5c47bl2w94fpbynyc";
+ rev = "fecabaff94c34bf8ed9c3b2a45d42a5906ea251c";
+ sha256 = "1wsx9ky30wawyiflb613wm1bshrfbs7xdrf2ysllznn5bd1sn4xk";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@@ -4823,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/";
};
@@ -4859,12 +4859,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2023-02-04";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "33e76b0c22465de03906ebd00c01b64a04e495b3";
- sha256 = "0kxfwmvp7pgvqr6cqs6zf5dklq6n7vcgzr1dj435f8yg6zh90aah";
+ rev = "369f16f29559cb15931d3d5acfcf253969f74066";
+ sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -5195,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/";
};
@@ -5219,12 +5219,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
- version = "2023-02-04";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
- rev = "de8dbd4ba6583619ed02323dbde737d586ba572f";
- sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b";
+ rev = "45d2575527c080d6f87fd0b7741d877be88f0d26";
+ sha256 = "1i62214yc69n99xbshm5yd3nj9j7wg4wqhn2gjclmay8vw05kak0";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@@ -5243,12 +5243,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
- version = "2023-02-04";
+ version = "2023-02-13";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
- rev = "70cab52c9d19e982f306716534e90c37a254b046";
- sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l";
+ rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac";
+ sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@@ -5339,12 +5339,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2023-02-04";
+ version = "2023-02-11";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "ac8828369cb2a4b2e1e17e6b495645585ed2a37b";
- sha256 = "1ljyzvk3ff876sp4idfqq3ziqm7c6wc63kii3nsvh9i4m0w5i5af";
+ rev = "9766bef893ec993af9408ea0d44a8f13adbd1e80";
+ sha256 = "0wjiy1z19wgqn2jk419cm5545i3mp75zl6sq1srr5bfv8scvls2q";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -5399,12 +5399,12 @@ final: prev:
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
- version = "2023-01-25";
+ version = "2023-02-13";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
- rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00";
- sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w";
+ rev = "8807379e37229ece7ae6ff12080ce505b98289b8";
+ sha256 = "0v55zx0zk7i1wcyd80h3vnpf247l4zrmxgk1lqnizydaayafgjml";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
@@ -5423,12 +5423,12 @@ final: prev:
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/";
};
@@ -5471,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/";
};
@@ -5543,12 +5543,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2023-01-29";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "aa793975d10dda69817190faea84e28eeb176934";
- sha256 = "15ml496n90dd80z4gm09562wzfv8npch3sz0kdv6hjkkgg04p3rw";
+ rev = "14489dfa8c4241a919845ed9101fae074234f35b";
+ sha256 = "09slqmdrcgdsdlwxgmkzg2py4qd91934cx3mq9x6k95jzf2ghyzg";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -5579,12 +5579,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
- version = "2023-02-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
- rev = "c2db6cfd687df2fba323ba31ad0d862d6129f62c";
- sha256 = "0k7mhz2k05qwyrx9iyc9psjfshxzw8p1618fiyr7cck9aphzwqlf";
+ rev = "d48847d0f9df136727e0e7f6626ec334c4a8fca7";
+ sha256 = "02qd9j9sxcgg0fp61nssgkhyzhn65llsprwajng27ajc0421kixy";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@@ -5613,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-15";
+ src = fetchFromGitHub {
+ owner = "shortcuts";
+ repo = "no-neck-pain.nvim";
+ rev = "5067cfdd0e3f33c659fa50c710785a2da70ca306";
+ sha256 = "09a52f5dhjzchm6n9xq3jxy2vx3lhpnwdmnp9ryak67rig86iyna";
+ };
+ 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/";
};
@@ -5687,12 +5699,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2023-02-03";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "8f5d730021497233c39d3adbf4b8043d4be163f8";
- sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0";
+ rev = "a75bba0ae5e89df03f01c17a1d913884eeebcc2e";
+ sha256 = "1gbnvh8p071f07h987q3b6k2zkhh9vf7qvvjmq2c3lgn6g3snzbl";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5747,12 +5759,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2023-01-30";
+ version = "2023-02-07";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "5a3523ddb573804752de6c021c5cb82e267b79ca";
- sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1";
+ rev = "45ae3122a4c7744db41298b41f9f5a3f092123e6";
+ sha256 = "16zryzm0ng0f8zl13jpkhjmqya0rbs4vy2zdm9zhd2qsnnpbb6rh";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -5783,12 +5795,12 @@ 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/";
};
@@ -5819,12 +5831,12 @@ final: prev:
nvim-cmp = buildNeovimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2023-02-03";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d";
- sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6";
+ rev = "208d69f233d65526a22c6497ed57d0c80d99fa5f";
+ sha256 = "1pv5mcs07a4cg05h23wxv4ddaxkzgd32fkr8p89k6fwl6v35s3jc";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -5927,24 +5939,24 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2023-01-29";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185";
- sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c";
+ rev = "82e98f340cf5183e1c8743a3986c5b2e8705063b";
+ sha256 = "1d30acci28hw27k9ifdz41kkcwfmqblk816hv8zqxg2l7ylpycbb";
};
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/";
};
@@ -5963,24 +5975,24 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2023-01-31";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "885e958ff9de30cfbc359259eccf28cc493ad46b";
- sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss";
+ rev = "110193102b4840be8bda6eb2358367026145ae3a";
+ sha256 = "1a3j5ipwinsp0xfp5hg8sd2kspx972s6z5qrig463c4wdy6b3h3i";
};
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/";
};
@@ -6059,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/";
};
@@ -6095,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-12";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-jqx";
- rev = "24d3e0228aec27280e091d09ff65593e99d4d564";
- sha256 = "06zp3hffwjgq3c30d7h3a3bnx7vw77xwz4g3kcb54rxffvhjwwvj";
+ rev = "a4ff0404d0fdd5213a9804c74c4a5ca40a1e4364";
+ sha256 = "0zdzfrsn751ff34lbqjnr6m2pis0fij20d10dpjidy3dbrgzc34d";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/";
};
@@ -6179,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/";
};
@@ -6297,6 +6309,18 @@ final: prev:
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
+ nvim-osc52 = buildVimPluginFrom2Nix {
+ pname = "nvim-osc52";
+ version = "2023-01-10";
+ src = fetchFromGitHub {
+ owner = "ojroques";
+ repo = "nvim-osc52";
+ rev = "27da4724a887dabed3768b41fa51c785cb62ef26";
+ sha256 = "1wylh055y2dyb7zcdk9sa41wnkfbknp2bgnlrhmxdq5h2bkr8hbd";
+ };
+ meta.homepage = "https://github.com/ojroques/nvim-osc52/";
+ };
+
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
version = "2022-11-16";
@@ -6323,12 +6347,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/";
};
@@ -6347,12 +6371,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/";
};
@@ -6371,24 +6395,24 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
- version = "2023-02-02";
+ version = "2023-02-07";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180";
- sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd";
+ rev = "1d8b7a40677fd87da7648d246c4675c3612a7582";
+ sha256 = "1bcxyq8jglkpfkhrj0zq5gj74sivws00zavl5py37xrmqp0948a8";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
nvim-surround = buildVimPluginFrom2Nix {
pname = "nvim-surround";
- version = "2023-01-01";
+ version = "2023-02-09";
src = fetchFromGitHub {
owner = "kylechui";
repo = "nvim-surround";
- rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e";
- sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz";
+ rev = "90821ad682aac189cd0a38fd83fc96f0cbcc5d29";
+ sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577";
};
meta.homepage = "https://github.com/kylechui/nvim-surround/";
};
@@ -6419,35 +6443,35 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2023-02-04";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
- rev = "7eb33d2a6d5d574a43159da90e0eac2445367393";
- sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1";
+ rev = "08a0aa1a3b7411ee0a7887c8818528b1558cef96";
+ sha256 = "0kgc928nrdjzl0sjm1yqfd489yw36fa4w0vbmp1siwwfrck97l5n";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2023-02-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "bd7b4b6eff2dcb4a8a65f55d51398e79fa3d4ec6";
- sha256 = "08amxr13yfqi2301lrdb0swl6wfjkbi3i7cq5r5ypyw7xaj1nbqb";
+ rev = "b44871afb59e456bbff4113e416405c06c991cf5";
+ sha256 = "1i6rlz06r0bg1zk33qzwz0h3sh7vglf9m2hfvm31i6pfsyngd1ib";
};
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/";
@@ -6479,12 +6503,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2023-01-31";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "249d90a84df63f3ffff65fcc06a45d58415672de";
- sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz";
+ rev = "15d9c62cb04079cf440ceb6882f2cbfaed66eda1";
+ sha256 = "0wr3f1x2xn0046q4283dw16aw2w05fkiv215fnxcy3hr09hflrr3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -6515,35 +6539,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-04";
+ version = "2023-02-15";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
- rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123";
- sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv";
+ rev = "24e6fda74d62475e1ca1cf1909af587710f14575";
+ sha256 = "0vb2ncgc27iaks5xviwsq5cz7labc6gybqgcd1w0m167y3jz1zx6";
};
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-02-04";
+ version = "2023-02-13";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
- rev = "2b96193abe4372e18e4f4533895a42a466d53c17";
- sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd";
+ rev = "bb6d4fd1e010300510172b173ab5205d37af084f";
+ sha256 = "0aax38cimal8jnisvj2zryfjzjrrb3fwylbkh7gbyysdfz46fv06";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@@ -6574,12 +6610,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/";
};
@@ -6622,24 +6658,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/";
@@ -6671,12 +6707,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/";
};
@@ -6695,12 +6731,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2023-02-02";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b";
- sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351";
+ rev = "f79b875361d06a326d855393b5ed0ce4186a15c4";
+ sha256 = "1n2pnncggjn1gpgl9xjwjhdzd9xpn3iv0z4zbz56qpcm9rdsmizs";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -6719,12 +6755,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/";
};
@@ -6755,24 +6791,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/";
};
@@ -7006,6 +7042,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";
@@ -7020,12 +7068,12 @@ final: prev:
purescript-vim = buildVimPluginFrom2Nix {
pname = "purescript-vim";
- version = "2023-02-04";
+ version = "2023-02-06";
src = fetchFromGitHub {
owner = "purescript-contrib";
repo = "purescript-vim";
- rev = "9a01f01991ca52ae835da09f483aeeeb79639739";
- sha256 = "0ix3gxh1d3iw9zjmw41yc3fk2dxz5xi5j0l7bn4xv7shbdpki1la";
+ rev = "82348352e6568fcc0385bd7c99a8ead3a479feea";
+ sha256 = "14729v7rndi3l8fpnbzapgwb4dj7537fik54g6frm1r1724f5cr2";
};
meta.homepage = "https://github.com/purescript-contrib/purescript-vim/";
};
@@ -7249,12 +7297,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/";
};
@@ -7309,12 +7357,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/";
};
@@ -7538,12 +7586,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/";
};
@@ -7586,12 +7634,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/";
};
@@ -8153,36 +8201,36 @@ final: prev:
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
pname = "telescope-file-browser.nvim";
- version = "2022-12-31";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-file-browser.nvim";
- rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8";
- sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m";
+ rev = "4a7a7d2746c1c11d0e26b9dd638a62df08692ae5";
+ sha256 = "0znrr8w23l7bgrf5py1zbb5q0k79sjm6fcv33m1wizxc3bg1h5hh";
};
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/";
};
@@ -8320,6 +8368,18 @@ final: prev:
meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/";
};
+ telescope-undo-nvim = buildVimPluginFrom2Nix {
+ pname = "telescope-undo.nvim";
+ version = "2023-01-29";
+ src = fetchFromGitHub {
+ owner = "debugloop";
+ repo = "telescope-undo.nvim";
+ rev = "b5e31b358095074b60d87690bd1dc0a020a2afab";
+ sha256 = "1hpqd0dgb01in5dbqs2ps3wr12iqnf0pd0xdnaalvq7rmvsmvz7a";
+ };
+ meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/";
+ };
+
telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix {
pname = "telescope-vim-bookmarks.nvim";
version = "2022-07-17";
@@ -8346,12 +8406,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/";
};
@@ -8512,6 +8572,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";
@@ -8599,12 +8671,12 @@ final: prev:
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/";
};
@@ -8635,12 +8707,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/";
};
@@ -8671,12 +8743,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
- version = "2023-01-23";
+ version = "2023-02-10";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271";
- sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i";
+ rev = "556ef3089709a6e253df1e500381fec5eb48e48a";
+ sha256 = "0ragk770zibpqggvz8l78is0zr839r2py6k5261wmn1qwslagz06";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -8779,12 +8851,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
- version = "2023-02-03";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
- rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75";
- sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7";
+ rev = "aeac746d73251efd6c89d555d07cffe6c8176682";
+ sha256 = "09sz5hwpci77k397xm01xf8sc37j91635ixb7lpq0da02ar7qs8l";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@@ -8875,12 +8947,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/";
};
@@ -8971,12 +9043,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/";
};
@@ -9067,12 +9139,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/";
};
@@ -9607,12 +9679,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2023-01-30";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f";
- sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h";
+ rev = "8331526e2ad92082087694809ba7cd57fbfd009a";
+ sha256 = "1pmb86jrqz40jz21whn56bdsj6adp2xl6qgjn7sgq1nj25nppghm";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -9667,12 +9739,12 @@ 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/";
};
@@ -9871,12 +9943,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/";
};
@@ -9895,12 +9967,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/";
};
@@ -9991,12 +10063,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/";
};
@@ -10387,24 +10459,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/";
};
@@ -10543,12 +10615,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2023-02-04";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "58437d8250cc3355b565725073f51ff0ff77cea6";
- sha256 = "1fsrhyawry2m4dq7lrh1zvanxn2qi35lqg1al92w065sf62mds9z";
+ rev = "633074c6a02866f967e0576c491f9ca0df3e9f9a";
+ sha256 = "0fmsn2pqyklpcqvivhk7hvg8zndskrz9r9znd8m2wbdaa7rlsd79";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -10844,12 +10916,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/";
};
@@ -10928,12 +11000,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/";
};
@@ -11157,12 +11229,12 @@ final: prev:
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
- version = "2023-02-04";
+ version = "2023-02-05";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
- rev = "9b18bd548ec1fd6e94b262b3af0d9fb337c0b1df";
- sha256 = "1paqjvvrcgngpggwa2a57d85xzvz5g5mk43bzn5fkgc1xfd77yv1";
+ rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536";
+ sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@@ -11277,12 +11349,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/";
};
@@ -11386,12 +11458,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/";
};
@@ -11482,12 +11554,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/";
};
@@ -11866,12 +11938,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/";
};
@@ -12646,12 +12718,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/";
};
@@ -12899,12 +12971,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/";
};
@@ -13079,24 +13151,24 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2023-02-02";
+ version = "2023-02-06";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7";
- sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9";
+ rev = "9d1dd5116c13b6d850a81291422a4a9818622b6c";
+ sha256 = "00n2lq23m9b050ianbr5b655c23qasspvc5kf56dzpkjxgza56am";
};
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/";
};
@@ -13151,12 +13223,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/";
};
@@ -13307,12 +13379,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/";
};
@@ -13607,12 +13679,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/";
@@ -13620,12 +13692,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/";
};
@@ -13728,12 +13800,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/";
};
@@ -13909,12 +13981,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/";
};
@@ -13957,24 +14029,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/";
};
@@ -14005,12 +14077,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2023-02-01";
+ version = "2023-02-15";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "8769e767f12f5bf0b7d1250ee067088e7054809a";
- sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p";
+ rev = "b0ab85552b0f60ab7a0aa46f432e709c124f8153";
+ sha256 = "06c0cr5df3fmvqpzkxdnfr7dff0bab28ycngaq7i5bsbrd6pbjn3";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -14029,12 +14101,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2023-02-03";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "baae8d0a8afb062f5be6d83189e626dd74f41f98";
- sha256 = "024iis733yvvkqil2m0wxh7lpkz0j7ij2if4yds07izbyyrpdxg6";
+ rev = "c37df0dcd9a379fc6e17dfaac42ecf9ce5b25977";
+ sha256 = "0s6jpa5n7h2235x2kx7i7qhrf9zzvqqhc4h8crq62da2qvhhqsqh";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -14053,12 +14125,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/";
};
@@ -14077,12 +14149,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
- version = "2023-02-04";
+ version = "2023-02-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "9a7013874a9d5e0413039fc9ded613fcdbd59cbd";
- sha256 = "1n9dkd6wlghw1b011xnja2h36l68x5pi3cf7f4khw7zfk0f49r1k";
+ rev = "397201abffa681419a610ecbfd5d3c0fed45d20a";
+ sha256 = "1q117ha9cs45nadq5m46qsaw2vxpa44a8r6sa64xk81cx7nlf2w4";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 80e960b640..fcf44b0b98 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -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,23 +115,23 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
- version = "a29bac0";
+ version = "18e4343";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
- rev = "a29bac0681802139710b4d3875540901504d15cb";
- hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY=";
+ rev = "18e434383a4582b4fd183a30e55022c2923764e1";
+ hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
};
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";
};
@@ -159,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";
};
@@ -271,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";
};
@@ -304,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";
@@ -371,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";
};
@@ -404,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";
};
@@ -426,12 +426,12 @@
};
fortran = buildGrammar {
language = "fortran";
- version = "edcb337";
+ version = "069bd7c";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
- rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
- hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
+ rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
+ hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -448,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";
};
@@ -470,12 +470,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
- version = "4849e65";
+ version = "31ebb7c";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
- rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
- hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
+ rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc";
+ hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@@ -537,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";
};
@@ -637,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";
};
@@ -835,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";
};
@@ -857,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";
};
@@ -956,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";
@@ -1046,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";
};
@@ -1126,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";
};
@@ -1192,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";
};
@@ -1258,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";
};
@@ -1311,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";
@@ -1434,12 +1445,12 @@
};
sql = buildGrammar {
language = "sql";
- version = "c508e60";
+ version = "7be06f4";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
- rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
- hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
+ rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
+ hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@@ -1514,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";
@@ -1538,12 +1549,12 @@
};
thrift = buildGrammar {
language = "thrift";
- version = "634a73f";
+ version = "d1f350b";
src = fetchFromGitHub {
owner = "duskmoon314";
repo = "tree-sitter-thrift";
- rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b";
- hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA=";
+ rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da";
+ hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U=";
};
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
};
@@ -1560,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";
};
@@ -1639,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";
@@ -1684,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";
};
@@ -1750,12 +1761,12 @@
};
zig = buildGrammar {
language = "zig";
- version = "b0693dd";
+ version = "6b3f578";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
- rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
- hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
+ rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
+ hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
index 0b02b1d9d8..bd03fd2fde 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/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 ];
});
@@ -1088,7 +1096,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI=";
+ cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw=";
};
in
''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6552349d1e..dcfef882ef 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -472,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/,,
@@ -530,6 +531,7 @@ 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/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,
@@ -550,6 +552,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/,,
@@ -589,6 +592,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/,,
@@ -698,6 +702,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/,,
@@ -714,6 +719,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/,,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix
index 4235aa5e92..74c811c2ea 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
index 41666183ce..00a1a5f16e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/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;
@@ -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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
index e713ba29e8..7089f9e3d3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
index 7c58a4bdfb..818cca5177 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 1e6195021c..65675dd924 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "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/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/c64-debugger/default.nix
new file mode 100644
index 0000000000..b7c357ca27
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix
index ad9c470bf4..b9ef4682e8 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix
deleted file mode 100644
index 7f68b58214..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch
deleted file mode 100644
index 7da013ecd8..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix
index c1820646dc..f26fb7c9d7 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix
index 084bf07454..aedf42ee12 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix
index a2664e1264..7713c14594 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix
index c72ff4929b..ed6b75ad40 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json
index e4198184ed..08c65a7dbf 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix
index d3d5f1e11f..b9efcaaf4f 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix
+++ b/third_party/nixpkgs/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 = "14684-8652b7d35";
- rpcs3Version = "0.0.26-14684-8652b7d35";
- rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82";
- rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf";
+ 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/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
index f299d9fe3f..069e6f63cc 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
index d45e6a699a..a61b0980d8 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
openssl
slang
zip
- ] ++ lib.optional x11Support [ libX11 ]
+ ] ++ lib.optionals x11Support [ libX11 ]
++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix
index 334228f98e..605340cbc8 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/file-managers/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/vifm/default.nix
index ad326e4597..ab7da2deac 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/vifm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix
index 477dc400fe..aae4f973ed 100644
--- a/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix
@@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "denaro";
- version = "2023.1.1";
+ version = "2023.2.0";
src = fetchFromGitHub {
owner = "nlogozzo";
repo = "NickvisionMoney";
rev = version;
- hash = "sha256-U6/laqmOS7ZUhgCCHggIn1U3GyQ/wy05XuCcqc7gtVQ=";
+ hash = "sha256-ot6VfCzGrJnLaw658QsOe9M0HiqNDrtxvLWpXj9nXko=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;
@@ -64,6 +64,7 @@ buildDotnetModule rec {
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/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix
index 31bf0a76b1..c1665c3830 100644
--- a/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix
@@ -3,38 +3,116 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
- (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.2.0"; sha256 = "1lvyw61kcjq9m6iaw7c7xfjk1b99ccsh79819qnigdi37p7dgb7y"; })
- (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.2.0"; sha256 = "14jr3476h3lr3s0iahyf9in96631h7b8g36wpfgr0gz6snic6ch1"; })
- (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.2.0"; sha256 = "0as1iknxx8vd5c0snf3bssij20fy74dbzaqbq60djf7v4c5q46nq"; })
- (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.2.0"; sha256 = "19rh6mm2zxg46gdnizic4v6pmdk2hx25r4k12r8z4mkbmzpmcaaf"; })
- (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.2.0"; sha256 = "11v4zplb7flh24vn1pralanzjm9jlnmx8r867ihvzj73mphmzs6m"; })
- (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.2.0"; sha256 = "0489ba4gw6wq1ndlrhfi7pmnifvnhq52p0riih60lrhgi3664ybc"; })
- (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.2.0"; sha256 = "0ms6gbrrinznhvs15mhfm3xh4zlqv5j4sw2zgajisiiprdzh2rcz"; })
- (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.2.0"; sha256 = "17qk1zhvfmmywndv2n6d3hg0gs1cwmxlmsns5ink7g8prwfp0vpf"; })
- (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.2.0"; sha256 = "0gkj37rrazksvyc4nq3scmch7mxlcj40w8kwsmfvmvyl58z2faq7"; })
- (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.2.0"; sha256 = "0qxw84hl40rbgjcxwx4rhmi4dif519kbdypazl2laz14pirh0b8v"; })
- (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.2.0"; sha256 = "1klskbfkaaqy5asy83hbgb64pziib63s6d0szx3i3z24ynwhqjp3"; })
- (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.2.0"; sha256 = "03vp892bzy3nm5x35aqg8ripkw2n9gc86fqm3pr9fa1l88dhbqnl"; })
- (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.2.0"; sha256 = "158bsyirbdzyxnyphgzl8p6mxw1f9xbjpd92aijxk4hwdjvgn9hn"; })
+ (fetchNuGet { pname = "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 = "Microsoft.Data.Sqlite"; version = "7.0.1"; sha256 = "1abakjiljrh0jabdk2bdgbi7lwzrzxmkkd8p5sm67xm5f4ni8db5"; })
- (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.1"; sha256 = "1vkgng2rmpmazklwd9gnyrdngjf2n8bdm2y55njzny2fwpdy82rq"; })
+ (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 = "QuestPDF"; version = "2022.12.0"; sha256 = "0hkcw871jm77jqbgnbxixd5nxpxzzz0jcr61adsry2b15ymzmkb1"; })
+ (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_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; })
+ (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.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; })
- (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; })
+ (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/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
index 59794b88a4..d535625c71 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
index 0ad5226133..1d7863df05 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
@@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
- version = "7.1.0-61";
+ version = "7.1.0-62";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
- hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg=";
+ hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix
index 8b4411ad04..d088f633c3 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
index e8fd036480..ca2aa96bea 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
index ae44b47643..5f75d2770a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix
index 325d1bcf08..8f70d9273b 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
index a82c6ec2f7..ecb09e539b 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix
index b0e346331b..d690f5e067 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix
index 951bb9d7d8..ff00d565f4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix
index cfb63e0e3f..e8e6a2cc9f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix
index b1c4f2258f..54f956981e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix
index c1f78b1807..85bbd1414c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch
deleted file mode 100644
index 8c3257e888..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/fix-6324.patch b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/fix-6324.patch
deleted file mode 100644
index fa324c2c93..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
index 1636567470..bf19d0f77e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
index 36c4c694a1..aecdf58186 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kdevelop/wrapper.nix b/third_party/nixpkgs/pkgs/applications/kde/kdevelop/wrapper.nix
index 86d3de9eb3..c73f2bba7b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdevelop/wrapper.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix
index 900653633a..8617e34542 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix
@@ -42,8 +42,14 @@ stdenv.mkDerivation rec {
# Relative paths.
"BINDIR=/bin"
"PERLDIR=/share/perl5"
- "MODSDIR=/nonexistent" # AMC will test for that dir before
- # defaulting to the "portable" strategy, so this test *must* fail.
+ "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/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
index 4290978426..9bb2a11b7c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
index acfe1d9284..d7198461ee 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
index f6035b3c6c..1405bc5b90 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
- sha256 = "sha256-pA+SWktSjgH7lRqK14yJX2ziLoKpxMCpEIh0H6slpxw=";
+ sha256 = "sha256-5PtMXipULnzAnarESu2biYOeHSlDeKXoX5XnlpvgIAk=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix b/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix
index 04b1af9bc2..a20b8ab726 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix
deleted file mode 100644
index 8c68f8672c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
index 5a9c5122ac..3508ff0122 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix
index 09f9b85e4b..49798c8432 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
index d91f03a696..022eba1fd6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
@@ -4,11 +4,11 @@ let
inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
in buildDotnetPackage rec {
pname = "keepass";
- version = "2.53";
+ version = "2.53.1";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
- hash = "sha256-wpXbLH9VyjJyb+KuQ8xmbik1jq+xqAFRxsxAuLM5MI0=";
+ hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM=";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
index 9a9db9d70f..f0ed6a07e5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
index d1a19eeccc..921ae570bc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix b/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix
index 7c27b3b971..ce8ebef16a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
index 935a9582fc..e5e0f92ed1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix
index 9f416ff75a..bb1c725dff 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix
index 91f2db2a28..917476023c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfsam-basic";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
- hash = "sha256-+nBLmbu1aRnfWYNhTBUJdRmdlud8FK7LZFvDNFDrhiI=";
+ hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k=";
};
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix
index 27f4afb435..39a6312103 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix
index 9480a32aae..7987208b88 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix b/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
index 2a00cb92b9..e5900a050e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
index 28602cf024..d6e820e06f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix
index af8a538a82..d732fdde13 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix
new file mode 100644
index 0000000000..e3daca956c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/third_party/nixpkgs/pkgs/applications/misc/tuckr/update-cargo-lock.diff
new file mode 100644
index 0000000000..45fe445042
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
index fc66c908be..bb498c7ee2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix
index 9ae1b348e3..499f1b44db 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
index 0cf50c96ad..3f62f3381c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index 2f39e82f3b..1eea3e8962 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 4a7048010c..b79c69275a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -150,10 +150,10 @@ let
libdrm wayland mesa.drivers libxkbcommon
curl
libepoxy
+ libffi
] ++ lib.optional systemdSupport systemd
++ lib.optionals cupsSupport [ libgcrypt cups ]
- ++ lib.optional pulseSupport libpulseaudio
- ++ lib.optional (chromiumVersionAtLeast "110") libffi;
+ ++ lib.optional pulseSupport libpulseaudio;
patches = [
# Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
@@ -293,15 +293,6 @@ 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";
- } // lib.optionalAttrs (chromiumVersionAtLeast "110") {
# To fix the build as we don't provide libffi_pic.a
# (ld.lld: error: unable to find library -l:libffi_pic.a):
use_system_libffi = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 1eeec11742..25e3cb6590 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
}
},
"beta": {
- "version": "110.0.5481.77",
- "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
- "sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr",
+ "version": "111.0.5563.19",
+ "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
+ "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza",
"deps": {
"gn": {
"version": "2022-12-12",
@@ -32,32 +32,32 @@
}
},
"dev": {
- "version": "111.0.5563.19",
- "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
- "sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp",
+ "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.78",
+ "sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj",
+ "sha256bin64": null,
"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.78-1",
+ "sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index d0ea4a8b49..74c9274443 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix
index e5284c4097..f7fe34cb8d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 6340a0a14e..97087ef1da 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 06bd49facb..de68807d8f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
index 01cd54cf8e..208bff18e1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
index 1bba399997..0683b5210c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
index 0a60dc7207..009569f9c5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "109.0.1-2",
+ "packageVersion": "110.0-1",
"source": {
- "rev": "109.0.1-2",
- "sha256": "1b5572i7aqad0pmjw88d3mhmhhhacp505z0d9l4l89r7gadssbwb"
+ "rev": "110.0-1",
+ "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p"
},
"firefox": {
- "version": "109.0.1",
- "sha512": "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"
+ "version": "110.0",
+ "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
index 2de8192150..e4730e1869 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
index 0afe9466b4..4dab874fd8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
index e2cc376af2..518a442329 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
index 6d13063bd0..fb9b6a1d11 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index 2ded360481..719c0f634f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
- version = "2.5.10";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "sha256-5UzDfOPuDM5ADsXFwWa9aDM32I5s/TKg4r7idH/X3AQ=";
+ sha256 = "sha256-O3JJ75qfs02qxzyW4TwPfYckhxuULRK7n67QVZRyB3I=";
};
proxyVendor = true; # darwin/linux hash mismatch
- vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA=";
+ 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/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
index 2077549095..6c71c903bf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
- version = "1.13.5";
+ version = "1.13.6";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-mBmjGP7O1uX+uVM4/us4RWeJcXB1lSEvZQWT/3Ygzik=";
+ hash = "sha256-CBWKKW5VIkRgl7wY63OCm/CowWHO389se3kEraqaDCI=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
index 3537b2b951..12868dcc5a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }:
buildGoModule rec {
pname = "kubernetes-helm";
@@ -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/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index 2a9b047723..fba5d36a42 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch
deleted file mode 100644
index 115fd68247..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/0001-script-download-strip-downloading-just-package-CRD.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001
-From: Euan Kemp
-Date: Thu, 3 Feb 2022 23:50:40 -0800
-Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD
-
-The CRD packaging is a complicated set of commands, so let's reuse it.
----
- scripts/download | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/scripts/download b/scripts/download
-index 5effc0562a..82361803ee 100755
---- a/scripts/download
-+++ b/scripts/download
-@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR}
- mkdir -p ${CHARTS_DIR}
- mkdir -p ${DATA_DIR}
-
--curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat
--
--git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR}
--
--git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR}
--
- setup_tmp() {
- TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR})
- cleanup() {
-@@ -44,8 +38,8 @@ setup_tmp() {
-
- download_and_package_traefik () {
- echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}"
-- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE}
-- code=$?
-+ # nixpkgs: copy in our known traefik chart instead
-+ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE}
-
- if [ $code -ne 0 ]; then
- echo "Error: Failed to download Traefik Helm chart!"
---
-2.34.1
-
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix
new file mode 100644
index 0000000000..8c40604d0f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/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/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix
index 1fbe7687a0..72fbe89dd6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_23/default.nix
@@ -48,30 +48,32 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
- k3sVersion = "1.23.6+k3s1"; # k3s git tag
- k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version
- k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i";
- k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs=";
+ k3sVersion = "1.23.16+k3s1"; # k3s git tag
+ k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version
+ k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk=";
+ k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ=";
- # 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";
+ # 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.3%2Bk3s1/scripts/version.sh#L47
- k3sRootVersion = "0.11.0";
- k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620";
+ # 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.3%2Bk3s1/scripts/version.sh#L45
- k3sCNIVersion = "1.0.1-k3s1";
- k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92";
+ # 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}'`
- containerdVersion = "1.5.11-k3s2";
- containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2";
+ # 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;
@@ -94,10 +96,9 @@ let
];
# bundled into the k3s binary
- traefikChart = fetchurl {
- url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
- sha256 = traefikChartSha256;
- };
+ 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
@@ -181,12 +182,13 @@ let
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
+ # 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
@@ -219,10 +221,6 @@ buildGoModule rec {
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
- patches = [
- ./0001-script-download-strip-downloading-just-package-CRD.patch
- ];
-
postPatch = ''
# Nix prefers dynamically linked binaries over static binary.
@@ -290,11 +288,9 @@ buildGoModule rec {
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
+
+ cp ${traefikChart} ./build/static/charts
+ cp ${traefik-crdChart} ./build/static/charts
export ARCH=$GOARCH
export DRONE_TAG="v${k3sVersion}"
@@ -324,8 +320,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.23
# passthru.updateScript = ./update.sh;
- # Fix-Me: Needs to be adapted specifically for 1.23
- # passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
+ passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
index 18e0258432..11037db5b6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix
@@ -322,8 +322,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.24
# passthru.updateScript = ./update.sh;
- # Fix-Me: Needs to be adapted specifically for 1.24
- # passthru.tests = nixosTests.k3s;
+ passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
index dc34821fb2..b62eec6928 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix
@@ -322,8 +322,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.25
# passthru.updateScript = ./update.sh;
- # Fix-Me: Needs to be adapted specifically for 1.25
- # passthru.tests = nixosTests.k3s;
+ passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix
index 74f54d28d5..cef2355a3d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix
index aefcef2bac..6a02127405 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
index 45f0ee66f6..9726edcf5f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
index 896c2ac5a0..7ac3f68b35 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
index 365016eb67..a124d633b3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
- version = "23.1.2";
- sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq";
- vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA=";
+ version = "23.2.1";
+ sha256 = "0qjl6qxfg6bj22fwm2y01if5dqp2w79y45ibrg46r33pf6gbwjxj";
+ vendorSha256 = "sha256-YxWBjbE3aBFfCbQeSTfQv5QzP5n4IRHHqNrFwrJPQ7g=";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
index c9af58b1a8..fc2aa83aa4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix
index 877dddfa1e..5ef93e307c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
index 0d0d0ab084..bad060ba41 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8d922bd46d..f2afa21bc3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
- "hash": "sha256-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=",
+ "hash": "sha256-gAIZQIljgrYNtaDrPqWnd7K0rQkKz67hQWJyVgs4ZNs=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
- "rev": "v4.53.0",
+ "rev": "v4.54.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q="
+ "vendorHash": "sha256-9YvQP1QWnT2Rb9D65j6g2edxTDaoGisVlQWFNnH4lSs="
},
"azuread": {
"hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=",
@@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
- "hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=",
+ "hash": "sha256-b2KEq7QBpPR7100VCFIe9KGMm8Soy2wr/TAbUT0NxEQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
- "rev": "v3.42.0",
+ "rev": "v3.43.0",
"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=",
@@ -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
},
@@ -439,22 +438,22 @@
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
},
"google": {
- "hash": "sha256-B/eXf31mRtWpl6TCv/hukPWfbb7Ne4W2FUMxiAbfsfI=",
+ "hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.52.0",
+ "rev": "v4.53.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
"google-beta": {
- "hash": "sha256-ISOhZqc6/RMqG4n63RjQluy0odkKATcCa52YpQW89xQ=",
+ "hash": "sha256-eXIYVB3YzhJNjYNR1oB7bj5uGZgRhgMD5eWxLls6KoE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.52.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
},
@@ -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="
},
@@ -812,20 +811,20 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
- "hash": "sha256-mzAfqJcAZEFGmptjaXAtbmcrtVyufd2LLTe8TmFHtQc=",
+ "hash": "sha256-PjtsFrUwLsSLXog/n6JkFLFPZm7FPa/n8N5IJ0vkuuE=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
- "rev": "v4.107.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
},
@@ -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-yVI1f86Gpkwl3jCAs5d54rZS8lM7cjbwWq+HUXwi8EU=",
+ "hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.79.8",
+ "rev": "v1.79.10",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1228,11 +1227,11 @@
"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/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index 4865ca4901..6a722b80b8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
index 19aaa36c7e..ebb28798f5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index f14433b6c1..dca8f27786 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.5.21";
+ version = "3.5.23";
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-VWpcXwiQHpQ3X/rmm6fWfPfuUoUmWQMfOq5A87nED3A=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
index 287e83ffa0..60c928e0b9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix
index 88319182a6..2285a11bbf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
index a44f3f555d..bf7626759b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 3d9fc7627b..f4eb47428b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
index 5a65b43a8a..d9288c4a44 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index fdfb992192..87eb241686 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.24";
ptb = "0.0.38";
- canary = "0.0.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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client.nix
index f76d9ee9f1..80efff68e6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common
deleted file mode 100644
index 0aac24e24b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux
deleted file mode 100644
index 6c40e8d2ea..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86
deleted file mode 100644
index 2043aa3ee2..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches
deleted file mode 100644
index 28f884e667..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix
index 715560c6e1..bf2392f631 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix
index ea898c0da8..497616a6c0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 0ef6b2e74d..cb634f434d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 2c34523f55..d8f3fcb179 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
- version = "6.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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
index 35846f4b7e..3fe012fd0b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
- version = "20230203";
+ version = "20230211";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
- sha256 = "sha256-xXIdXv2U5VpRSuJ9Kl6HMDBZGpXRYGPZFBBk9QYODtU=";
+ 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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
index 1d9ca8d838..4a49ff991e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
index 96a7d6d2ef..bf583de53b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix
index a9e023cdf6..b15dbbb92b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 7bd88eaa75..0f2ef4d586 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index f2e9deb981..e292fb2521 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -75,7 +75,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
- version = "4.6.1";
+ version = "4.6.2";
# 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 = "1df9rx3a6xvgipgzn5h4jc46nsdkypl4255si606bkrccdz8bcrl";
+ sha256 = "0lrflhnlsajay8gbz1x91fqk2ckxwpqmm19hyjfqxkvi56nl7a0g";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index e80ccd2105..9feb5ff10a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix
index e821b7ff58..d5a977f65f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix
+++ b/third_party/nixpkgs/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=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
index e280b73900..4806e3ae4a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
index ddc0f4b932..9ffdb16301 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
index d5e40edeb6..9dee3ed33d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index 8033a734b9..49e8852fd0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index a5ed92f519..65bb334611 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
index dfa92fc42c..91a424d9eb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
index a2972f9bfb..6b5e8a254c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix
index 4592d17d34..41ff2b74a0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/n8n/fix-permissions.diff b/third_party/nixpkgs/pkgs/applications/networking/n8n/fix-permissions.diff
deleted file mode 100644
index 81a5a4ee64..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
index 34a86c3140..0b08453a96 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
@@ -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" = {
@@ -1255,15 +1255,6 @@ let
sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==";
};
};
- "@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==";
- };
- };
"@types/express-serve-static-core-4.17.33" = {
name = "_at_types_slash_express-serve-static-core";
packageName = "@types/express-serve-static-core";
@@ -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.19" = {
+ "@types/node-18.13.0" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "18.11.19";
+ version = "18.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz";
- sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==";
+ 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";
@@ -1966,13 +1966,13 @@ let
sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
};
};
- "aws-sdk-2.1310.0" = {
+ "aws-sdk-2.1313.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1310.0";
+ version = "2.1313.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1310.0.tgz";
- sha512 = "D0m9uFUa1UVXWTe4GSyNJP4+6DXwboE2FEG/URkLoo4r9Q8LHxwNFCGkBhaoEwssREyRe2LOYS1Nag/6WyvC6Q==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz";
+ sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ==";
};
};
"aws-sign2-0.7.0" = {
@@ -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";
@@ -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.5.0" = {
+ "logform-2.5.1" = {
name = "logform";
packageName = "logform";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/logform/-/logform-2.5.0.tgz";
- sha512 = "fsFiH2yjSCTmzotZ5JmEo0brQyJ7iHrc8pQ5pnHg6e1e5WfkqdNMDvgRWSfz+aCr3Y2YxYzHA4UKj+6QoctKrg==";
+ 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.2" = {
+ "minipass-4.0.3" = {
name = "minipass";
packageName = "minipass";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-4.0.2.tgz";
- sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A==";
+ 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.2" = {
+ "n8n-editor-ui-0.181.1" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.180.2";
+ version = "0.181.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.2.tgz";
- sha512 = "5XIIDN6X2CbQtDFwthCOqanvkOgbbFu36h9LZb/eB8KdQKs5dxNFi958lIrKuyZaiPYBQTZCPZWMcqqie+9JIQ==";
+ 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.2" = {
+ "n8n-nodes-base-0.213.1" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.212.2";
+ version = "0.213.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.2.tgz";
- sha512 = "kmuuZOvQ+c84Eap2TW/RUzTZffYznI9fscTUSZYd8xpFdbptIH9TL0pkkcKhybvOC5y0CFPeMKV5JcH0uEujmw==";
+ 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.32.0" = {
+ "node-abi-3.33.0" = {
name = "node-abi";
packageName = "node-abi";
- version = "3.32.0";
+ version = "3.33.0";
src = fetchurl {
- url = "https://registry.npmjs.org/node-abi/-/node-abi-3.32.0.tgz";
- sha512 = "HkwdiLzE/LeuOMIQq/dJq70oNyRc88+wt5CH/RXYseE00LkA/c4PkS6Ti1vE4OHYUiKjkwuxjWq9pItgrz8UJw==";
+ 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" = {
@@ -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" = {
@@ -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.2";
+ version = "0.215.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.214.2.tgz";
- sha512 = "9KbRJMT8/f4+5kiCnqZbe+ETKdBnBb5VJtw7DUbtu3Uj327dtGlPeX2E/kgXwwonnkO6XgdOteJZDSiixxozbg==";
+ 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,79 +11403,36 @@ 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"
@@ -11466,7 +11450,6 @@ in
(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"
@@ -11657,16 +11646,15 @@ in
sources."@types/duplexify-3.6.1"
sources."@types/es-aggregate-error-1.0.2"
sources."@types/express-4.17.17"
- sources."@types/express-jwt-0.0.42"
sources."@types/express-serve-static-core-4.17.33"
- sources."@types/express-unless-2.0.1"
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.19"
+ sources."@types/node-18.13.0"
(sources."@types/node-fetch-2.6.2" // {
dependencies = [
sources."form-data-3.0.1"
@@ -11679,6 +11667,7 @@ 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.12"
@@ -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.1310.0" // {
+ (sources."aws-sdk-2.1313.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -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,7 +12206,7 @@ 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"
@@ -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.5.0"
+ 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.2"
+ 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.2"
- (sources."n8n-nodes-base-0.212.2" // {
+ 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.32.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"
@@ -13084,11 +13029,7 @@ in
sources."throwback-4.1.0"
sources."timeago.js-4.0.2"
sources."tinycolor2-1.6.0"
- (sources."title-case-3.0.3" // {
- dependencies = [
- sources."tslib-2.5.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 = [
@@ -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/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
index 24d0cdab72..6355f2418b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
- version = "3.7.1";
+ version = "3.7.3";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
- sha256 = "sha256-MbxGS1Msb3xCW0z8FrIZEY3XaBa4BmN+JFBkV/Pf79A=";
+ sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix
index b1d01f8287..6765c029ff 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 319a5e7f0d..64394696ca 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
index 13175aaca6..caba715921 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix
index eae9a8a3d8..33747e2d66 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
index 5036eb998b..74b68bfdcc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "3.41";
+ version = "3.42";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
- hash = "sha256-sNeuIcRJ249F9m7NBi5Vh4HMhWwDpNHAZsit1auVI5U=";
+ hash = "sha256-MolxbV+B/u2v+9dcdia1QzvElxX5arZMpu1DnRvUam4=";
};
- vendorHash = "sha256-ZtHgZ0Mur102H2EvifsK3HYUQaI1dFMh/6eiJO09HBc=";
+ vendorHash = "sha256-79nX7l++brumkuFjKuDKxw6EhH0U+aYpia8fdSyY208=";
subPackages = [ "weed" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
index e74084e14c..3b171070a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
@@ -4,13 +4,13 @@ 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=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix
index dea70ffacd..850692f185 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix
index 700a944299..f9e9ec5770 100644
--- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix b/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix
index e885e03c1c..181c627f23 100644
--- a/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix
index ee621df4d8..ca6cab2c1e 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix
index 980a4aabf7..6323c2c417 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
index 9fe6221d49..65fab41df9 100644
--- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
index fc1087ab2d..9b7c58ef5c 100644
--- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
index 17b4089ed7..4ddbd42259 100644
--- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
- version = "unstable-2023-01-31";
+ version = "unstable-2023-02-14";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
- rev = "44206849d03c8983e41d2aeca70a06e04365d88d";
- sha256 = "bUyM0zWVO7HWBiWi0mhkDlVxgqMHoFiR78XpiG8q/V4=";
+ rev = "16d449a3bf2805c1fc683fdc183e0e8390074252";
+ sha256 = "jm6bLu+6G3VMSyB56B5qATqFZ3sXjm8s66Gx2oZyvFA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix
index 1e1800fad4..7a7e48d736 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix
@@ -3,7 +3,7 @@
, cmake
, corrosion
, extra-cmake-modules
-, gcc11
+, gcc12
, kconfig
, kcoreaddons
, kdbusaddons
@@ -46,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
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix
index cb87fe0ed2..14bfc6d189 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix
index 86a4f1d100..9efbaa6033 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix
index 2f655d5a9e..8b3da82b8b 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/qmlkonsole.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/qmlkonsole.nix
new file mode 100644
index 0000000000..da892fb47c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix
index 7a2a3c0af8..c120851e5b 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix
@@ -1,6 +1,6 @@
{ lib
, mkDerivation
-, gcc11Stdenv
+, gcc12Stdenv
, srcs
, cmake
@@ -24,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;
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix
index ff6aaf35be..bdbc22cb78 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix
index 926022353e..c38c89fc45 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix
index 6d0d71e867..aa89d88197 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix
+++ b/third_party/nixpkgs/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 ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
index 6cdae4cb53..bd878312d8 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/diamond/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
index 9aa655932d..c555a30b15 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix
index 8ea115c6b2..b4999193e1 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/inormalize/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix
index 7a101e6e19..0104a5506b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix
index e8aef4138b..42178722b5 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/minc-widgets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix
index 659b1e97f2..b7c8c138cb 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix
index b21ef2d71d..00fd0ff008 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
index b5b5be84c8..98f7ccbfee 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
index d0058c8650..cc145baef0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
index d7250db07b..697c278420 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
index 9765d2fcc1..c7eb9d6952 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
index cc567ae711..4562e84476 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix
index ba5719012e..d61a989394 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix
@@ -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/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index 10d77885b5..49c9fc47fe 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
+++ b/third_party/nixpkgs/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; }
@@ -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/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
index 83acfcfe9c..580de87bdb 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
@@ -8,15 +8,18 @@
# R as of writing does not support outputting both .so and .a files; it outputs:
# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
, static ? false
+, testers
}:
assert (!blas.isILP64) && (!lapack.isILP64);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "R";
version = "4.2.2";
- src = fetchurl {
+ src = let
+ inherit (finalAttrs) pname version;
+ in fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU=";
};
@@ -97,6 +100,8 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
+ passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
meta = with lib; {
homepage = "http://www.r-project.org/";
description = "Free software environment for statistical computing and graphics";
@@ -121,8 +126,9 @@ stdenv.mkDerivation rec {
user-defined recursive functions and input and output facilities.
'';
+ pkgConfigModules = [ "libR" ];
platforms = platforms.all;
maintainers = with maintainers; [ jbedo ] ++ teams.sage.members;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
index 677e7d9a0d..7a466f8c00 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
@@ -134,8 +134,6 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942
rm -r "$out/share/gap/pkg"
cp -ar pkg tst "$out/share/gap"
-
- makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap"
'';
preFixup = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix
index dcba888ce2..021593124a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix
@@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=maybe-uninitialized"
+ "-Wno-error=uninitialized"
+ ];
+
postPatch = ''
substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
--replace "/bin/bash" "${bash}/bin/bash"
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
index 4c0032e6c8..41dff3aded 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
+, fetchpatch
, gmp
, libX11
, libpthreadstubs
@@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
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/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md b/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md
index c3a81c2109..c4de5da45d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
index 1f8b33f687..39d358a1f9 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/env-locations.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch
deleted file mode 100644
index 40bbbe23f1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index d68a2c8a10..5e18b74156 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix
index 79d4f78082..4910f5e8bf 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
index 8ac8adcbf5..815ccc6cc2 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20230201130431";
+ version = "3.1.20230209161050";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg=";
+ hash = "sha256-gc/KSJS3KcxXc3xDyJSXavaxtwhKBiihgdI7yc7d2I8=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
index 088fa83b7d..ffa0a158ac 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix
index c3ac1f6e0a..ec29c02054 100644
--- a/third_party/nixpkgs/pkgs/applications/science/physics/nnpdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
index 7ae2825f17..bd80a15d05 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix
index f7ba075114..04a810cf9e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix
index a60aa27a84..7fd1b34d45 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/fnc/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
+ NIX_CFLAGS_COMPILE = [
+ # Needed with GCC 12
+ "-Wno-error=maybe-uninitialized"
+ ];
+
preInstall = ''
mkdir -p $out/bin
'';
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
index 65eee3d93b..fddf3b24fd 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
@@ -20,13 +20,13 @@
buildGoModule rec {
pname = "forgejo";
- version = "1.18.3-0";
+ version = "1.18.3-1";
src = fetchurl {
name = "${pname}-src-${version}.tar.gz";
# see https://codeberg.org/forgejo/forgejo/releases
- url = "https://codeberg.org/attachments/384fd9ab-7c64-4c29-9b1b-cdb803c48103";
- hash = "sha256-zBGd+wPJDw7bwRvAlscqbQHDG6po3dlbpYccfanbtyU=";
+ url = "https://codeberg.org/attachments/3fdf0967-d3f4-4488-a2bf-276c4a64d97c";
+ hash = "sha256-H69qKdmz5qHJ353UZYztUlStpj/RyE6LA8cDaRnVYAQ=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix
index 92e8d9095b..0df0669c41 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix
@@ -12,7 +12,7 @@
let
pname = "gfold";
- version = "4.3.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-yvMp5x1uiJGkWHnwfONx4pVotSSE6sTW4uqWpI2AFXg=";
+ sha256 = "sha256-jlUGtTtoJ3DQbs4VEDUbYyl+s9S+bLTQ+GM6OQg6MNo=";
};
- cargoHash = "sha256-MBWaNjs840twU9SQLvgVcXTT0RN2QJ7PiaAohiiQu3s=";
+ cargoHash = "sha256-Mrqg0wOG3JHDdGMZMcFsifpazOukZeoMPrQh4vIfQyU=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix
index 27998f1c9c..e9b4d75bf6 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix
index 0ef5a678ee..a7dbf0c6ba 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 2b6018dfe4..4d91154657 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix
index 7e66985bb8..008d161ce2 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix
index f74ae1cf37..213243f185 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock
index cd4fee2194..ff91d07e87 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix
index 8873e8c471..80cc6bf9e9 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json b/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json
index 9cbcd71cbc..eeedd64b95 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix
index cba7be9531..4c6f27b561 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
index 62122bc35b..2bed38959c 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix
index 26954375af..3d62384634 100644
--- a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix
index 3849acda94..25fac4fba6 100644
--- a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix
index 4f2b4ef440..d6379550e8 100644
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 02c5892555..b1bf0dac39 100644
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix
index c2885ba03a..f219a3fd1f 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix b/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix
index d0d52ade25..bc36039224 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mirakurun/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
index fa6167b9c1..2ac85084b4 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix
index 02270cd75e..ec980f1bfd 100644
--- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
index 4214bed716..904f039758 100644
--- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
index d95b37ef1d..6e6a6434ed 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
index 1646c05175..cada624a2a 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
new file mode 100644
index 0000000000..85806bfcd8
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix
index 0815781c21..c93f8a6897 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch
deleted file mode 100644
index a837c3bf06..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index 0ac55e0bec..766a9fd1de 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
@@ -14,8 +14,52 @@
, go-md2man
, nixosTests
, python3
+, makeWrapper
+, symlinkJoin
+, extraPackages ? [ ]
+, runc
+, crun
+, conmon
+, slirp4netns
+, fuse-overlayfs
+, util-linux
+, iptables
+, iproute2
+, catatonit
+, gvproxy
+, aardvark-dns
+, netavark
+, testers
+, podman
}:
+let
+ # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
+ binPath = lib.makeBinPath ([
+ ] ++ lib.optionals stdenv.isLinux [
+ runc
+ crun
+ conmon
+ slirp4netns
+ fuse-overlayfs
+ util-linux
+ iptables
+ iproute2
+ ] ++ extraPackages);
+
+ helpersBin = symlinkJoin {
+ name = "podman-helper-binary-wrapper";
+
+ # this only works for some binaries, others may need to be be added to `binPath` or in the modules
+ paths = [
+ gvproxy
+ ] ++ lib.optionals stdenv.isLinux [
+ aardvark-dns
+ catatonit # added here for the pause image and also set in `containersConf` for `init_path`
+ netavark
+ ];
+ };
+in
buildGoModule rec {
pname = "podman";
version = "4.4.1";
@@ -36,9 +80,9 @@ buildGoModule rec {
doCheck = false;
- outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ];
+ outputs = [ "out" "man" ];
- nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ];
+ nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ];
buildInputs = lib.optionals stdenv.isLinux [
btrfs-progs
@@ -50,13 +94,16 @@ buildGoModule rec {
systemd
];
+ HELPER_BINARIES_DIR = "${helpersBin}/bin";
+ PREFIX = "${placeholder "out"}";
+
buildPhase = ''
runHook preBuild
patchShebangs .
${if stdenv.isDarwin then ''
make podman-remote # podman-mac-helper uses FHS paths
'' else ''
- make bin/podman bin/rootlessport
+ make bin/podman bin/rootlessport bin/quadlet
''}
make docs
runHook postBuild
@@ -64,29 +111,28 @@ buildGoModule rec {
installPhase = ''
runHook preInstall
- mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper
${if stdenv.isDarwin then ''
- mv bin/{darwin/podman,podman}
+ install bin/darwin/podman -Dt $out/bin
'' else ''
- install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
- for s in contrib/systemd/**/*.in; do
- substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary
- done
- PREFIX=$out make install.systemd
- install -Dm555 bin/rootlessport -t $rootlessport/bin
+ make install.bin install.systemd
''}
- install -Dm555 bin/podman -t $out/bin
- PREFIX=$out make install.completions
- MANDIR=$man/share/man make install.man
+ make install.completions install.man
+ wrapProgram $out/bin/podman \
+ --prefix PATH : ${lib.escapeShellArg binPath}
runHook postInstall
'';
postFixup = lib.optionalString stdenv.isLinux ''
- RPATH=$(patchelf --print-rpath $out/bin/podman)
- patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman
+ RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)
+ patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
'';
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/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix
deleted file mode 100644
index 7fe483a707..0000000000
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ podman-unwrapped
-, runCommand
-, makeWrapper
-, symlinkJoin
-, lib
-, stdenv
-, extraPackages ? []
-, runc # Default container runtime
-, crun # Container runtime (default with cgroups v2 for podman/buildah)
-, conmon # Container runtime monitor
-, slirp4netns # User-mode networking for unprivileged namespaces
-, fuse-overlayfs # CoW for images, much faster than default vfs
-, util-linux # nsenter
-, iptables
-, iproute2
-, catatonit
-, gvproxy
-, aardvark-dns
-, netavark
-}:
-
-# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
-
-let
- binPath = lib.makeBinPath ([
- ] ++ lib.optionals stdenv.isLinux [
- runc
- crun
- conmon
- slirp4netns
- fuse-overlayfs
- util-linux
- iptables
- iproute2
- ] ++ extraPackages);
-
- helpersBin = symlinkJoin {
- name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}";
-
- # this only works for some binaries, others may need to be be added to `binPath` or in the modules
- paths = [
- gvproxy
- ] ++ lib.optionals stdenv.isLinux [
- aardvark-dns
- catatonit # added here for the pause image and also set in `containersConf` for `init_path`
- netavark
- podman-unwrapped.rootlessport
- ];
- };
-
-in runCommand podman-unwrapped.name {
- name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}";
- inherit (podman-unwrapped) pname version passthru;
-
- preferLocalBuild = true;
-
- meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ];
-
- outputs = [
- "out"
- "man"
- ];
-
- nativeBuildInputs = [
- makeWrapper
- ];
-
-} ''
- ln -s ${podman-unwrapped.man} $man
-
- mkdir -p $out/bin
- ln -s ${podman-unwrapped}/etc $out/etc
- ln -s ${podman-unwrapped}/lib $out/lib
- ln -s ${podman-unwrapped}/share $out/share
- makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \
- --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
- --prefix PATH : ${lib.escapeShellArg binPath}
-''
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index e68cf7048b..c20a2c53d6 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
index 06c8c4fcc0..aa626443c5 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
@@ -7,16 +7,14 @@ let
apptainer = callPackage
(import ./generic.nix rec {
pname = "apptainer";
- # TODO: Upgrade to 1.1.4 only after https://github.com/apptainer/apptainer/pull/967 get merge
- # and https://github.com/apptainer/apptainer/issues/958 get fixed
- version = "1.1.3";
+ version = "1.1.5";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "v${version}";
- hash = "sha256-QFg6RC77OE/a6Qlzn6Zi5I7Iaq/U3/m0eI9yLArzuNc=";
+ hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic=";
};
# Update by running
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
index 2e8aa34286..0e24dd9b08 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix
index 5347b0961a..6e483a40ef 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
index 251092049c..6e2e45e8b9 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix
index e86af9dad5..439030f34d 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
index 6cfc552402..32c8cf1b86 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
index 30e43fa0c9..20a7a5ed7f 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix b/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix
index 7186675a5c..fec2d0526b 100644
--- a/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix b/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix
index 80fb7be8c1..9886a035e4 100644
--- a/third_party/nixpkgs/pkgs/build-support/alternatives/lapack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix b/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix
new file mode 100644
index 0000000000..577328cad9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py b/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py
new file mode 100644
index 0000000000..16dd8a7e96
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 45ae3eba9b..6e33f6189a 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
index d1cd502e7e..a3f331b23c 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 5bffa2b205..048233d728 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -137,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
@@ -171,6 +183,7 @@ let
"''${ro_mounts[@]}"
"''${symlinks[@]}"
"''${auto_mounts[@]}"
+ "''${x11_args[@]}"
${concatStringsSep "\n " extraBwrapArgs}
${init runScript}/bin/${name}-init ${initArgs}
)
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
index 7ebcba7370..c4d967a11c 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix
index 09457caecb..fbc50c2dc2 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix b/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix
index 64c6568e1b..810ef52235 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, graalvm, glibcLocales }:
+{ lib, stdenv, graalvm-ce, glibcLocales }:
{ name ? "${args.pname}-${args.version}"
# Final executable name
@@ -19,7 +19,7 @@
# XMX size of GraalVM during build
, graalvmXmx ? "-J-Xmx6g"
# The GraalVM derivation to use
-, graalvmDrv ? graalvm
+, graalvmDrv ? graalvm-ce
# Locale to be used by GraalVM compiler
, LC_ALL ? "en_US.UTF-8"
, meta ? { }
@@ -51,12 +51,14 @@ stdenv.mkDerivation (args // {
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;
})
diff --git a/third_party/nixpkgs/pkgs/build-support/build-setupcfg/default.nix b/third_party/nixpkgs/pkgs/build-support/build-setupcfg/default.nix
index bc6482f0a8..5737989249 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-setupcfg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index 33df804d5e..6520c04f5e 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix
index 8dc77f3aac..ea1c532808 100644
--- a/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix b/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix
index 6d084d3c77..da19848326 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix
index 3a4876bc5d..7866c403ec 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix
index 2d0b4b20ef..56973f5d36 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix
index 15309d0a19..b3c28fb0e2 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix
index 3ebe797f73..d059715ced 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchpatch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
index b5eb21e5ba..6e2de7fa11 100644
--- a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c b/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c
index 1222d2ee75..9ecc16450c 100644
--- a/third_party/nixpkgs/pkgs/build-support/libredirect/libredirect.c
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/libredirect/test.c b/third_party/nixpkgs/pkgs/build-support/libredirect/test.c
index 144e6d3d66..7dd384ae3e 100644
--- a/third_party/nixpkgs/pkgs/build-support/libredirect/test.c
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/nuke-references/default.nix b/third_party/nixpkgs/pkgs/build-support/nuke-references/default.nix
index c2dfe27b2c..8f02c55923 100644
--- a/third_party/nixpkgs/pkgs/build-support/nuke-references/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh
index 1aa14cfeb7..1d43c8e162 100644
--- a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix b/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix
index 168343c808..24d5b2e1ca 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/binary-tarball.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix
index 679adad827..6e08caf0a4 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/default.nix b/third_party/nixpkgs/pkgs/build-support/release/default.nix
index da1078369a..ee414ea328 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/maven-build.nix b/third_party/nixpkgs/pkgs/build-support/release/maven-build.nix
index daee44b85a..f618032724 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/maven-build.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix
index 9578fbf482..0498232d4d 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/release/rpm-build.nix b/third_party/nixpkgs/pkgs/build-support/release/rpm-build.nix
index 47c01f2e66..8f47114705 100644
--- a/third_party/nixpkgs/pkgs/build-support/release/rpm-build.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix
index 700e21a722..9ed88bb4f0 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -301,7 +301,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/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
index 69ee4f56b9..b057d1681b 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix
index 7ca306b613..36ab931697 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/fetch-cargo-tarball/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix
index 77397f9b72..aa5ba14c13 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index f34353a761..b07b0c5ae8 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix
index 84754e5803..403bc9b1d2 100644
--- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags b/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags
index 703e71438a..cf0a52d922 100755
--- a/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix
index 9d8c28681a..4bf50d3385 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index 7e3a662fda..5baa9374a5 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "18.0.0";
+ version = "19.0.0";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index 6d387516e8..7c5525c85d 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "03f2rabj2w2l7jwqyl2awj42jhh0l3picqgyfcv3q067i34abfyn";
- iosevka-aile = "0p1r5sysy6djfd1sx0pfxf42bv7ayqgk1nvil33jr925w96i2dp6";
- iosevka-curly = "0r33wcgvh315avgkkic27qpf3bavrqwbig1kj4wm5rdr957ldk40";
- iosevka-curly-slab = "0yd7grhnx7z27xmd3wr8x2xx2002hmfi1y3ndmqq1sc9gab5gcb7";
- iosevka-etoile = "0jhd49vxxxaqi1rxfkmpc3v1q96ak1b5wyggchngqi3739pjgqy3";
- iosevka-slab = "00wk15kj9b1nr3b0bmarx6gqx3jg8z1pm9qqf9x09s72b3ng8adm";
- iosevka-ss01 = "1kp6zv8zyx50la7zrfz4fis68s41kplibagny61w5v3w36xpm3cs";
- iosevka-ss02 = "1c0dl28a3wwa5g4793jyb4n4c8p5vjlyh1b8j2i5da31dqrqm9gj";
- iosevka-ss03 = "0vs8x6l8gwqi47g1c5ainsk5fb2i6j4wv7mgdyw5j5l3blnba5yh";
- iosevka-ss04 = "1caf4xqd1dywzbq06ip042rw88833yk9ws7y3vjvsp93g7a2r675";
- iosevka-ss05 = "008aphj4w6ri3fgnydrxavvpm3bfywv4cym10fqi9xgd84jhm9m1";
- iosevka-ss06 = "00dkagqiwzwzvv75zss82yx0gdcbmh9xvr8swhi5zk0y0bc3xk2y";
- iosevka-ss07 = "1acnva081awp76xyspksq9jkvlyswh3q1jy9gnsc6kh4vyn17vjs";
- iosevka-ss08 = "0lmkglcjlppvfd7k2pz57r476fa4c0q5l4gqzfy1mlklh0mc5hqb";
- iosevka-ss09 = "04r2k2z54iszwfnif872p5br0dm4fvc5341cpbxv4almpzxjyqnr";
- iosevka-ss10 = "1c6gs9g8dhywpd2ha7kx2l7g7bwj7i5a78645ipx8126f749y0y9";
- iosevka-ss11 = "0286k56r12a2yjylxynvzd0idrcv4ykrmpkn3b5xv9f74qq6irmf";
- iosevka-ss12 = "0ab4x5lh8spbg0djb092vcq1cnvjhazwkia8byq1q47iwiyh756l";
- iosevka-ss13 = "0kva71mfkl9xzz8khjzgrj47zg2505rg0hv5hxflawxsqwi4iwvl";
- iosevka-ss14 = "1gk7m3xh4v3jm6s5g2prd27w4p0r1blbxsxdy3b020bdwikxcaga";
- iosevka-ss15 = "0frxjc3hhay8izsx4ywff4j39qxp9ljz6hvw0rjcya3vny515jq5";
- iosevka-ss16 = "1g299yhn0kfc7vn8vbgwq4798w5lcl72j6hj91k90i1yq11lg13i";
- iosevka-ss17 = "02z83x73bhpgf44kq0gw46bdnpqzr4vm37h78bh19vydzqaj8hg0";
- iosevka-ss18 = "1b7vhhbspi98xzmk4hpiw08jmscm7f7nibqxhkfmppl6y0ymbm9d";
- sgr-iosevka = "1n60dgprl2p22wwfhxpwy9v9xf6vyv3qwm2jdc0m9m0q9jwjashr";
- sgr-iosevka-aile = "1k195vqv2wajhmyma43xgda3s2z86kl2gksgdrm95s9sx7ijns2s";
- sgr-iosevka-curly = "15yq1fs7knp9gxgqjxslpmlx85c6kvpm31sf81llpf4k5f9dmlcp";
- sgr-iosevka-curly-slab = "0fa68lm6iwlf2s5k8388dwgk015c55zg1wkhhhjmixwn7p8gifxz";
- sgr-iosevka-etoile = "1ry1zc7cdx6g927d1752ipz39v4wsnfrnn8n9cfwamz8v458wld1";
- sgr-iosevka-fixed = "173v09dx5pwsbh9jac5qxi7nk95dqyryg747hl58bchby6kmnc3k";
- sgr-iosevka-fixed-curly = "11y8bj9vmdq48n370f1r4zsk72ci3cq7c9ff6y40hn5w40s8k379";
- sgr-iosevka-fixed-curly-slab = "1a4gmz6sl67l23awkfl8f3xdr8hbb2mi1lsc0ain1wvvyx1bi56m";
- sgr-iosevka-fixed-slab = "11xv18ykrfg2fdvbrlcx7k3qvp5yqbm278ks3gm0gbck1awvfckg";
- sgr-iosevka-fixed-ss01 = "1yb96x53wjks537vs0gd7rss6piszs139k1kgb1swrpq7519awaz";
- sgr-iosevka-fixed-ss02 = "10yy0yg2i9nm00lzpmrfbdh7jjcll37wql3fcsaxha57gcxf9nf0";
- sgr-iosevka-fixed-ss03 = "1fpjfqlqq6lz3gya1q24nzy2xls6nxn567lhglj0ykjnh3prkll8";
- sgr-iosevka-fixed-ss04 = "1kwa5mwd6ihsyj2y70hrrvgy41cs19i0f7nvl4khs3i69a1l58ag";
- sgr-iosevka-fixed-ss05 = "08v8in8s8p2nayazq60w1kc1jpq48nwdwh6wbxv7ij7lfwii8xws";
- sgr-iosevka-fixed-ss06 = "03jzylw99xa3b6hpy6bpwhyii6d9fggy9synfl54sn7smwqk08wr";
- sgr-iosevka-fixed-ss07 = "13yzd6r51gka03fcl3bvx6d97b4m4px2cnsd724maqkqrcxkbxgb";
- sgr-iosevka-fixed-ss08 = "1xghlj7drx9328jr1cb051nkwv47r5ykkyy6ydff1c4amc1xabsq";
- sgr-iosevka-fixed-ss09 = "12l6lbz4m1lwyqqmv583777r9ymssy9x34rz72y3dch0mqhmjjzg";
- sgr-iosevka-fixed-ss10 = "1flrh6a7m0dw7na30nhbxjld54517z77ff3s9fjrpmgyb9wz7i2j";
- sgr-iosevka-fixed-ss11 = "1j4v4h6k505gkxyswcjf61kj9cfgkalxjg1arms9zb351p8rrkda";
- sgr-iosevka-fixed-ss12 = "00qwnsxc08bm5cq3ljz2pjqsiw019ah4z0crqcwaysijicxmbckc";
- sgr-iosevka-fixed-ss13 = "0jrw0amhfi28mc4i7a74qvgjamvymijlf3akskaw9qrmzvks8wn1";
- sgr-iosevka-fixed-ss14 = "0rvh842zkxdrna9nh2ylsjs3q90sq39658l0mafi85b8z5asdwai";
- sgr-iosevka-fixed-ss15 = "0j5yrr1biqfhgj6qg6359xg9rfv6qzqiqdqjgfjwbhijs6xfn8f1";
- sgr-iosevka-fixed-ss16 = "06jrfhb257nmldnxxyc5rh869r5y62v2y034c0r9j7354s7gcq7a";
- sgr-iosevka-fixed-ss17 = "0cgmsh0478963k1dgpkhy6j1b383gx2q09z3shr6j87knjjwqgp0";
- sgr-iosevka-fixed-ss18 = "0r4nyd459aqgna7dyzvxnznclqihxdb888g949kdzhxykfchq53s";
- sgr-iosevka-slab = "1bv8asz66hn80xvjxa7b0vgywha1bpmhd8q95cssc3085dprz1r6";
- sgr-iosevka-ss01 = "0sv19w0adnddzarf8dlz0n73jzqnp0xfb2lgh4xcpjkhm66j3fhh";
- sgr-iosevka-ss02 = "1ih10a666r77pvj57crdgyn7ll15giwxj0nis501r1fkp1bzkscn";
- sgr-iosevka-ss03 = "180hkjzzgasf9a58vi0n0cishnbyjgbjmkh60awcpxwvh85qd4hf";
- sgr-iosevka-ss04 = "1i4rpg9j967xaxg8h9dmachd3896f4jgwxa0mfjlizls2hfvnbsi";
- sgr-iosevka-ss05 = "1ca2z4dincjk7jl16pa6d7dnnzq3w3il7fr2lphvrjvdrxbci615";
- sgr-iosevka-ss06 = "08dj9dcq58grnp6lh16yvvzjqhzlm765v4ci1rys0wbjnp72xxda";
- sgr-iosevka-ss07 = "13k6plhdgxhp5gjs8z98wb480hh5wy6p2zmc4xvhp88y93fy8kk7";
- sgr-iosevka-ss08 = "1zfxamanq6a06fazn1jkaswh5g6iw22qnycg5dnxn4flk8nas1db";
- sgr-iosevka-ss09 = "0qaxp4fsvl26il16h78y2l8013m49cbk2nzxcs1k9g5if11a49d3";
- sgr-iosevka-ss10 = "1qvvm6rvhrbp83qjfb3dfsbam20f6aw52kg1i5ggfrqj35niv0hd";
- sgr-iosevka-ss11 = "1v2b456qj8kyacm7308gsim5p25wnyg8qabyrfvdj00h81s31akl";
- sgr-iosevka-ss12 = "1rsi6ir5vccar0n3ychisc40axiyhqj5yvcx450ppd33f3sd5rc7";
- sgr-iosevka-ss13 = "12x4q5l1pdxi065zs913dqd7zb8qpi4bbgd43h3k5azsrwxwvixr";
- sgr-iosevka-ss14 = "1snzdv23jqmbz25k9i2zl7px7yysk5hn74q1x251s07ghdx3nfdj";
- sgr-iosevka-ss15 = "0hbmj6wij6cv9yh76npp4xrl7fdm8jjx03398anfcsa02gkvg8zz";
- sgr-iosevka-ss16 = "0v6vhg0vp5ig6ngs96q5mxa2snfp08nk68a9772sm1ny61q3chrq";
- sgr-iosevka-ss17 = "0268b85yhdfsbjyhi0vlxwrpwxa8h919np53s060z94094h6jd9x";
- sgr-iosevka-ss18 = "13vnhh8181h36y6iz2p2x6rjgjv5w3d0gqbcdkwhgmvx7s03k122";
- sgr-iosevka-term = "05c2sxb4aris90mhjxyfkw1b0ga0hplfas669076h7yjsimw647l";
- sgr-iosevka-term-curly = "1j0b4fhcivkdgka9zyqf732hcxj8rchqxkwv2bwxib1a17fmwn6c";
- sgr-iosevka-term-curly-slab = "0dvv2n3plfxm8z2xi1ihzn4rncyk1kz8xbgyprnb0lvqiyf18igy";
- sgr-iosevka-term-slab = "0i7wrvq6c96q8v6zw9iym42b6sbm0vc04ysljghpblnnfymq5yv9";
- sgr-iosevka-term-ss01 = "1n23qp50pr466blpn2h9dhjbn0wnbbxyzb0sz751bk8db41lpyqb";
- sgr-iosevka-term-ss02 = "0ghvfhkdsfsjb8yjwvwlwhn66lmy8dx34126ccnvj0g77ww2nwa9";
- sgr-iosevka-term-ss03 = "03hnmy9wijqwsc36cg5b3pxj7mb1cbyacii00pcvrpcns2w1ssbw";
- sgr-iosevka-term-ss04 = "0fv9xhhii0h5ii4yxsdnywn45254494mgq1n5aajasq494cgxhp4";
- sgr-iosevka-term-ss05 = "0qa4l77sjpxd9l4nb555bhgzm0f1c74w6014md2rpljjvyy2mzwg";
- sgr-iosevka-term-ss06 = "05y7rmghvhmzw3spn7b3v6hmpcqg5p32flm437a1aljdr46sbxli";
- sgr-iosevka-term-ss07 = "1lzqgpr1vchi4ricqp1v49nv62rl3anbdvzpvddby81wr5jcyd1y";
- sgr-iosevka-term-ss08 = "1sxicv2gspc39fyja370dpiq12xd1bgndiw5r6cqfkkd8x8dgpdv";
- sgr-iosevka-term-ss09 = "0ax9pgm3d171kksrqd2z8xpr68kdxkqg9h344an55gjk01q7dzay";
- sgr-iosevka-term-ss10 = "1rgvadmvdldcaqa0r76kzmrck814qwksdqficaxcd7wk8bx64n81";
- sgr-iosevka-term-ss11 = "02if14ff5kax4p1aa2wkbidhwlzgyxi7lxir2ildahwfkvkp971y";
- sgr-iosevka-term-ss12 = "0sj8n12is4094nbj67wkk88953jp9235kvvr4230abql1g6s263r";
- sgr-iosevka-term-ss13 = "006sdcj8qw247b63d647ykm8razyb0apsfd0cjmlikj9hdmyzrr2";
- sgr-iosevka-term-ss14 = "0i7d3ldp9rj1f4kwdk8hkxq0s38df6i25qfx6hwfjj1c5bl3a843";
- sgr-iosevka-term-ss15 = "15gjqz7zc6wwy1l61pgpnz7wwyyaij43dcrwcwyi6h10jhm8b3ia";
- sgr-iosevka-term-ss16 = "1c1i1iyqzgh3pz4fzjp26d71lphmcgqbjp2s91yyqg3nfhwbzvyc";
- sgr-iosevka-term-ss17 = "0kr58576vlx81nb2ia5z9226m6h0ybd5vzfj5li9b721l4q0rpky";
- sgr-iosevka-term-ss18 = "1zjs40i4dmw2l45k8wydngl4g3a88nhbmmjwd5lsz8a40pq4bw15";
+ 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/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
index e99dfde411..6054066465 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix
index 6de851f557..9b04a87a7e 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
- version = "0.39.0";
+ version = "0.40.0";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
- hash = "sha256-n21aVsyQbZGR/dgAkYwMHB8VozTaazFVP29+p39SRKU=";
+ hash = "sha256-i8W1PLFPXR7ftRt51LmKZEqc22ms7RGFW9cKMUsMRhk=";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
index d86ce3f816..bd0147fecd 100644
--- a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors-themed/default.nix
@@ -1,14 +1,22 @@
-{ lib, fetchzip }:
-fetchzip rec {
+{ lib, stdenvNoCC, fetchzip }:
+
+stdenvNoCC.mkDerivation rec {
pname = "capitaine-cursors-themed";
version = "5";
- stripRoot = false;
- url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip";
- sha256 = "jQNAXuR/OtvohWziGYgb5Ni2/tEIGaY9HIyUUW793EY=";
- postFetch = ''
+ src = fetchzip {
+ url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip";
+ stripRoot = false;
+ hash = "sha256-ipPpmZKU/xLA45fdOvxVbtFDCUsCYIvzeps/DjhFkNg=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
mkdir -p $out/share/icons
cp -r ./ $out/share/icons
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
index f966f22b82..91d3426f01 100644
--- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "23.01.29";
+ version = "23.02.12";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-VmVzU8ACBE4Rx0uVScdQVbygDLE9MmD7ssD1j4ri74g=";
+ sha256 = "sha256-gQdVmF7ZzC+KjU0uQW6+sEw9Wz5940G60ebXqKHajuY=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix
new file mode 100644
index 0000000000..b7ef49135e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/icons/volantes-cursors/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, inkscape
+, xcursorgen
+}:
+stdenv.mkDerivation {
+ pname = "volantes-cursors";
+ version = "2022-08-27";
+
+ src = fetchFromGitHub {
+ owner = "varlesh";
+ repo = "volantes-cursors";
+ rev = "b13a4bbf6bd1d7e85fadf7f2ecc44acc198f8d01";
+ hash = "sha256-vJe1S+YHrUBwJSwt2+InTu5ho2FOtz7FjDxu0BIA1Js=";
+ };
+
+ strictDeps = true;
+ nativeBuildInputs = [ inkscape xcursorgen ];
+
+ makeTargets = [ "build" ];
+
+ makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
+ meta = with lib; {
+ homepage = "https://www.pling.com/p/1356095/";
+ description = "Classic cursor theme with a flying style";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ jordanisaacs ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix b/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix
index f19b666abe..729d3cdbb7 100644
--- a/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix
@@ -1,23 +1,24 @@
-{ lib, fetchzip }:
+{ lib, stdenvNoCC, fetchzip }:
-fetchzip rec {
+stdenvNoCC.mkDerivation rec {
pname = "cldr-annotations";
version = "42.0";
- url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
+ src = fetchzip {
+ url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
+ stripRoot = false;
+ hash = "sha256-paRon3ecGXNp3ZDnN1DU9RVU2NDWTBiKjy0OP3vcPLE=";
+ };
+
+ installPhase = ''
+ runHook preInstall
- stripRoot = false;
- postFetch = ''
mkdir -p $out/share/unicode/cldr/common
- mv $out/common/annotations{,Derived} -t $out/share/unicode/cldr/common
+ mv common/annotations{,Derived} -t $out/share/unicode/cldr/common
- shopt -s extglob dotglob
- rm -rf $out/!(share)
- shopt -u extglob dotglob
+ runHook postInstall
'';
- hash = "sha256-9OOd69nBaDSt+ilL3PTGpcQgC60PnHqd8/CYa2LgeI0=";
-
meta = with lib; {
description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
homepage = "https://cldr.unicode.org";
diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json
index 3cb903245f..97f82e4f7b 100644
--- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json
+++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
{
- "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",
- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz",
- "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",
- "msg": "Update from Hackage at 2023-01-12T12:18:29Z"
+ "commit": "307653b893cc53ffa71d6931c33101d352e3ead1",
+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/307653b893cc53ffa71d6931c33101d352e3ead1.tar.gz",
+ "sha256": "0mgmmzdlb9j4drkjjdrp2da8z4can7gg8zd007ya2jw17rz270hz",
+ "msg": "Update from Hackage at 2023-01-29T01:30:53Z"
}
diff --git a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
index 92bfe362bc..24fbeb0b0e 100644
--- a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-folders";
- version = "1.12.0";
+ version = "1.12.1";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "papirus-folders";
rev = "v${version}";
- sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
+ sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
index 063e120d3c..02b0ba0b43 100644
--- a/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/publicsuffix-list/default.nix
@@ -1,20 +1,24 @@
-{ lib, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub }:
-let
+stdenvNoCC.mkDerivation {
pname = "publicsuffix-list";
- version = "2021-09-03";
-in fetchFromGitHub {
- name = "${pname}-${version}";
- owner = "publicsuffix";
- repo = "list";
- rev = "2533d032871e1ef1f410fc0754b848d4587c8021";
- sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I=";
+ version = "unstable-2021-09-03";
- postFetch = ''
- install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix
- shopt -s extglob dotglob
- rm -rf $out/!(share)
- shopt -u extglob dotglob
+ src = fetchFromGitHub {
+ owner = "publicsuffix";
+ repo = "list";
+ rev = "2533d032871e1ef1f410fc0754b848d4587c8021";
+ hash = "sha256-moibTN9KovABcg+ubKUgMXg4b8sMrTVo6Itmiati/Vk=";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix b/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix
index bf27cb03e2..ae14a27c8b 100644
--- a/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix
index 6e5dc5f35a..a5bfac658b 100644
--- a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix
new file mode 100644
index 0000000000..a117562174
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix
index 1073fd8f25..c01c8e0816 100644
--- a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix
new file mode 100644
index 0000000000..f7ab5220b6
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
new file mode 100644
index 0000000000..7993cecd30
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
new file mode 100644
index 0000000000..8aa58bfa30
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix
index 2cb3e282b4..7af0d19cfa 100644
--- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix
@@ -38,6 +38,8 @@ let
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; };
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index df63449c2f..902178d167 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 4c9f28230c..7ce615fb3c 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix
index c79d3d731e..4f036de24d 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix
index 60de418f1e..bbab612b9c 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index 082483b1c2..f5ea57f1f8 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
index dfe109f57b..c0cfade44b 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix
index 760af24880..560d40ddc1 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix
index 450da49cf9..591bd397c0 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix
index aa3c7ed398..9d2e3d4eff 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json
index 47580d7f53..8beb546213 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix
index 189a84d335..dbd8a49a92 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json
index 4fd053d76d..ec8b643498 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json
+++ b/third_party/nixpkgs/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 -&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/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
index 55239caf2b..727ae63585 100644
--- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
index dcc5c7f7cf..f8fc60a540 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
index 2da4dc40e6..0c77e43817 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/flatpak-kcm.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/flatpak-kcm.nix
new file mode 100644
index 0000000000..406a0c9c92
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix
index 222e785582..2f27dd201c 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
index d53d808e10..f09104d534 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch
deleted file mode 100644
index ddaa7f76b1..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
index 50c7cef3f8..d0be721b04 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index 8f69c965ea..6269dd4d0c 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 3d19f2d89f..948c045db4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
index 3f169244fd..be1c6ff42e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-welcome.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-welcome.nix
new file mode 100644
index 0000000000..1ae778b328
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
index cc0a02b6aa..496223dc84 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix b/third_party/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix
index e26c905922..b05be287a8 100644
--- a/third_party/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix
index ac6d5f3c8b..2bba3a93c2 100644
--- a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-mix-deps.nix
+++ b/third_party/nixpkgs/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 ''${mixEnv:+--only $mixEnv}
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/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
index ce06782eb1..7bf6a64eeb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
@@ -13,12 +13,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
- version = "1.29.0";
+ version = "1.30.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
- sha256 = "sha256-HsXwh98RZuXvK/KkZ2NAGwWNLxUAQVj+WKzZXd4C4Is=";
+ sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8=";
fetchSubmodules = true;
};
@@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
#
# As a temporary fix, we disabled these tests when using clang stdenv
- LIT_FILTER_OUT = lib.optionalString stdenv.cc.isClang "CIRCT :: Target/ExportSystemC/.*\.mlir";
+ # 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"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dev86/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dev86/default.nix
index 2e6b0d3f68..67448f38f2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dev86/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix
index c1fb9abf77..3f8871df4f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
index caff0ad023..668391b264 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
index 6ce7779d56..4df0872688 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
+++ b/third_party/nixpkgs/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,39 +219,12 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- langAda
- libxcrypt
- gnatboot
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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
'';
@@ -198,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;
@@ -256,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
;
@@ -273,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/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix
index 482cc5f362..4b91e05983 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix
+++ b/third_party/nixpkgs/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,39 +228,12 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- langAda
- libxcrypt
- gnatboot
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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
'';
@@ -204,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;
@@ -262,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
;
@@ -279,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/third_party/nixpkgs/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch
new file mode 100644
index 0000000000..c3edd960f0
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix
index 5d8205a755..63168968cd 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix
@@ -123,6 +123,67 @@ 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
+ libxcrypt
+ mpfr
+ name
+ noSysDirs
+ patchelf
+ perl
+ profiledCompiler
+ reproducibleBuild
+ staticCompiler
+ stdenv
+ targetPackages
+ texinfo
+ threadsCross
+ which
+ zip
+ zlib
+ ;
+ };
+
in
stdenv.mkDerivation ({
@@ -165,10 +226,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 +248,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,42 +259,12 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- langAda
- langGo
- libucontext
- libxcrypt
- gnatboot
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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
'';
@@ -241,42 +272,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;
@@ -299,10 +303,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
;
@@ -316,22 +317,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/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
index e2e9cb66d0..7e6d4eb122 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix
@@ -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,84 +234,24 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- version
- langJava
- javaAwtGtk
- texinfo
- which
- gettext
- pkg-config
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- cloog
- isl
- zlib
- boehmgc
- zip
- unzip
- gtk2
- libart_lgpl
- perl
- xlibs
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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;
@@ -273,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
;
@@ -291,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/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
index eba68c39fd..4ea63d7c12 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix
@@ -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,84 +254,24 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- version
- langJava
- javaAwtGtk
- texinfo
- which
- gettext
- pkg-config
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- cloog
- isl
- zlib
- boehmgc
- zip
- unzip
- gtk2
- libart_lgpl
- perl
- xlibs
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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;
@@ -293,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
;
@@ -310,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/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
index 27d57a509a..7e5e2c6b10 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
+++ b/third_party/nixpkgs/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,94 +267,32 @@ stdenv.mkDerivation ({
''
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
- )
- else "");
+ ))
+ );
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- version
- langAda
- gnatboot
- flex
- langJava
- javaAwtGtk
- texinfo
- which
- gettext
- pkg-config
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- boehmgc
- zip
- unzip
- gtk2
- libart_lgpl
- perl
- xlibs
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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 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;
@@ -312,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
;
@@ -329,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/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
index d22e85c61a..75366c5b04 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
+++ b/third_party/nixpkgs/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,78 +222,30 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ 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;
@@ -261,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
;
@@ -278,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/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
index 2b43fc124b..e0b1a1e24a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
+++ b/third_party/nixpkgs/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,75 +204,26 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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
- ;
- };
+ 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;
@@ -238,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
;
@@ -255,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/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index ebf0bf0563..bcfd1c7dd3 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
+++ b/third_party/nixpkgs/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,79 +218,26 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
- inherit (import ../common/dependencies.nix {
- inherit
- lib
- stdenv
- buildPackages
- targetPackages
- crossStageStatic
- threadsCross
- langAda
- gnatboot
- version
- texinfo
- which
- gettext
- gnused
- patchelf
- gmp
- mpfr
- libmpc
- isl
- zlib
- zip
- perl
- ;
- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
+ inherit (callFile ../common/dependencies.nix { })
+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
- 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 { };
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;
@@ -253,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
;
@@ -270,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/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh
index dd5a8de76e..2d7a058fa0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
index 25e5914844..78d13cb941 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix
index a193ec887a..d3ae3e33c4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/dependencies.nix
@@ -79,7 +79,7 @@ in
++ [
targetPackages.stdenv.cc.bintools # For linking code at run-time
]
- ++ optionals (cloog != null) [ cloog ]
+ ++ optionals (lib.versionOlder version "5" && cloog != null) [ cloog ]
++ optionals (isl != null) [ isl ]
++ optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc zip unzip ]
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/meta.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/meta.nix
new file mode 100644
index 0000000000..84c3dc189b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix
index 10ee40f710..41461a26d4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix
index 94ad5a78a0..22552fa67f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix
index 57e0db560a..79b006ce55 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix
new file mode 100644
index 0000000000..b1cb9f0859
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix
index 3c089f0292..a6ecf62bbc 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix
index 84a6059581..829772fa01 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix
index a8c441813f..f432e54687 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
new file mode 100644
index 0000000000..a3236c14a0
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
new file mode 100644
index 0000000000..6037435d3a
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix
index 17ecd5060b..a0d57b75fa 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json
deleted file mode 100644
index c9145e9654..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json
deleted file mode 100644
index dc2da450b6..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix
new file mode 100644
index 0000000000..eb2f455abb
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix
new file mode 100644
index 0000000000..45cf50e90f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix
new file mode 100644
index 0000000000..9fc8fb3db9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
deleted file mode 100644
index 023fc81474..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
+++ /dev/null
@@ -1,346 +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"
-}:
-
-{ 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
- # Use musl instead of glibc to allow true static builds in GraalVM's
- # Native Image (i.e.: `--static --libc=musl`). This will cause glibc static
- # builds to fail, so it should be used with care
-, useMusl ? false
- # Extra libraries to be included in native-image using '-H:CLibraryPath' flag
-, extraCLibs ? [ ]
-}:
-
-assert useMusl -> stdenv.isLinux;
-
-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);
-
- cLibs = [ glibc zlib.static ]
- ++ lib.optionals (!useMusl) [ glibc.static ]
- ++ lib.optionals useMusl [ musl ]
- ++ extraCLibs;
-
- 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 = ''
- runHook preUnpack
-
- 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
-
- runHook postUnpack
- '';
-
- installPhase = ''
- runHook preInstall
-
- # 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
- ${
- # Wrap native-image binary to pass -H:CLibraryPath flag and find glibc
- lib.optionalString (withNativeImageSvm && stdenv.isLinux) ''
- wrapProgram $out/bin/native-image \
- ${lib.concatStringsSep " "
- (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)}
- ''
- }
-
- runHook postInstall
- '';
-
- dontStrip = true;
-
- # 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 = ''
- runHook preInstallCheck
-
- 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'
-
- ${
- lib.optionalString withNativeImageSvm ''
- echo "Ahead-Of-Time compilation"
- $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
- ./helloworld | fgrep 'Hello World'
- ''
- }
-
- ${# --static flag doesn't work for darwin
- lib.optionalString (withNativeImageSvm && stdenv.isLinux && !useMusl) ''
- echo "Ahead-Of-Time compilation 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 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 --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
- ''
- }
-
- runHook postInstallCheck
- '';
-
- 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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix
new file mode 100644
index 0000000000..427c5ffef5
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix
new file mode 100644
index 0000000000..022ac0a44f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix
new file mode 100644
index 0000000000..43d6e85ef5
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix
new file mode 100644
index 0000000000..30d0739b4b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix
deleted file mode 100644
index 8bb31c792d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.sh b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.sh
new file mode 100755
index 0000000000..6cafb0f0d1
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix
new file mode 100644
index 0000000000..9a5bef7c1e
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix
index c04897fad1..1213653208 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch
rename to third_party/nixpkgs/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff
diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/hare/config-template.mk b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/config-template.mk
index 1d0783b118..b3b0f53591 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/hare/hare/config-template.mk
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix
index 2c6b8da6e3..c1d5e7800c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix
index bdc9ef56b9..b29f53151a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix
index 610fffa038..5aa423bbf8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
index 5702ba2a2e..143feeb98e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix
index 95eba5d7fb..41c20ac47e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix
index 2123efdf23..93cf2757c6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix
index b04eeb3c72..3d5592e19e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix
index b6ee7b4dc2..b69f4bd129 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix
index 32e96212fa..e2d6da816f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix
index b6ee7b4dc2..b69f4bd129 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix
index 5437735f78..d8010ecf89 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix
index 303faf7bbb..c7b20dd28e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix
index e0b79a9acf..de98c43615 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix
index a4d04f0618..31b88098c8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix
index d18bf2149e..954887cd23 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix
index da72bb8b35..eaeef3c2ef 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix
index 5c381a896e..aa76fc0c3c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix
index 1eb7215c00..38002439c2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix
index f8b6a8170f..89bc014f5c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix
index 303faf7bbb..3162b0d41e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix
index b4e2757f20..9a0d375df9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
index 5a96242da7..da668b51e2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.09.1-Werror.patch b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.09.1-Werror.patch
new file mode 100644
index 0000000000..153c8a06e3
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix
index c5f649c15d..2d06720939 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.09.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix
index 798cdb790b..08406a2773 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix b/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
index 159dec05e2..76d1ebdb41 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix
index c9464813d3..ee075ec040 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/rust/1_66.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_66.nix
deleted file mode 100644
index 6aee98bdba..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/rust/1_67.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_67.nix
new file mode 100644
index 0000000000..a0a43f3138
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix
index d04eebe7ea..481b419589 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
index 426f137788..60f07a6429 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix
index c9aa4a962f..f7bcd8e5b4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix
index 55bf5237e6..9a3e68a1b7 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix
index a7d16cc247..0c7e0f8cbc 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix
index 159b1827fc..ed1d7fc57a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/urweb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/urweb/default.nix
index 67ebaa0469..a881b2f1ba 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/urweb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 8990067358..1ff817a829 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix
index 89f23b9ca2..6d41b63f03 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
+ "-DZIG_TARGET_MCPU=baseline"
];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 303a6ff400..65feba3d07 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/third_party/nixpkgs/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;
@@ -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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix
index 2c40ee7711..2ea7f41ed7 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index 54994347dd..8e3f63ec83 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 6278c72813..30d117103c 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index e1ee3b669e..570f58ec2f 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 961178a06d..2f37b91d9b 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -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 ]
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index dff7577fed..e2f7c3b8b7 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 136fe881b2..05492ca714 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
index 4b7201bb6a..7398636149 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index 3fb5c3e88a..8d054c40d6 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix
index ebaba1a22f..fa6d2a20a9 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
index 5b9546e750..7104a2164a 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix
index 688844bcc4..50daaf1362 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch
new file mode 100644
index 0000000000..948a0366ca
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 77ccd301b4..34eb2b71d7 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix
index 95b7d611fa..dfae27b371 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix
index 03dfb72d7a..8ece89ef4f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
index 3bcada9aa8..e413914aa3 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix
index 0f88c73311..caeef615ff 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
index dff3e4101d..e221956cf2 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix
index 37277baae8..ddc4ed17ac 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix
index 4bddae374a..48cf458178 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.1.15";
- hash = "sha256-GNoKlCKPQgf4uePiPogfK3TQ1srvuQi9tYY9SgEDXMY=";
+ version = "8.1.16";
+ hash = "sha256-zZ8OoU2C2UVVh6SaC2yAKnuNj/eXA/n0ixfbAQ+2M84=";
});
in
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix
index d37daff237..6dea1c8f90 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.2.2";
- hash = "sha256-9SI6UnTtqLQMGeR94N5GeMZdZEAcz3EOJGSWLrgTaAQ=";
+ version = "8.2.3";
+ hash = "sha256-h7tYhl849eKUGBMCkVLOohAv4pYbtNaLiPgx3dBUjQ8=";
});
in
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
index b8ceac621a..74dedcfe2d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
index 0f0a3f5e67..08e2717d41 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
index 6fad25ee8d..b7597a9925 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
index a25ab8a782..9b3baf8484 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index a95e0c2f65..ddf3963060 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix
index d5b02223fd..ee94d4aec0 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
index efd08f7d85..6602a6484f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
- sha256 = "sha256-MJKG/8b8l2RqWec5JoWcYLYrEKI9zrhJMyLqVcvAY+g=";
+ sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix
index 07c917473c..d5505009a0 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
index 57d1e6d84f..4461bd0836 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
index bdc4cf3690..2bf5bc7296 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix
index 23f7f46a47..57fa60aea2 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 51c0a9a7df..fbbfd4c973 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix
index ef89d1ca0a..ff6808b13b 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix
index ca771fa75f..0ffa5fc287 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix
index 32a0ae2e74..a4310b8f20 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh
index 4160303793..8548ac6640 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix
index 770661c605..c1a20a198f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix b/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix
index b35880e013..c058590c85 100644
--- a/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
index f424a2e67f..06793ee5e5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/StormLib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/StormLib/default.nix
index 0bf9ba63dc..cbf33e7a2c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/StormLib/default.nix
+++ b/third_party/nixpkgs/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,23 @@ stdenv.mkDerivation rec {
sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";
};
+ # 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";
+
+ 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/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix b/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix
index 61187581e9..4f605b8af9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/applet-window-buttons/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
index 5c60723309..4bebd82714 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix
index 81d9e54de4..ed0476fea6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
index d5562d89f5..28f13d50f7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
index 152572c6b1..a760685481 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix
index 61c2a27f3d..955157d055 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
index 71ac20c4f3..1c5126584c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
index 4bccc0c5cf..5791924ad1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix
index ee8e436d29..70a59bfa0d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix
@@ -156,7 +156,7 @@ in {
"cairo-ps"
"cairo-svg"
] ++ lib.optional gobjectSupport "cairo-gobject"
- ++ lib.optional pdfSupport "cairo-gobject";
+ ++ lib.optional pdfSupport "cairo-pdf";
platforms = platforms.all;
};
})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix
index d21c0243bf..578b4341e7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
index 861e9179e0..d928b814e8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch
new file mode 100644
index 0000000000..0ac26f7692
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix
index 88e5bcf5d9..6f4cdb1cf6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix
index 44fcbe5463..38acb5def4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cpp-ipfs-http-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
index 005f1ac030..1e38ddf44e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix
index 54df7be6f1..5663652429 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/edencommon/default.nix
new file mode 100644
index 0000000000..bd61fb603f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix b/third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix
index 08a650dbca..5fbb03a9fa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/example-robot-data/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fb303/default.nix
new file mode 100644
index 0000000000..2df547d75f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix
new file mode 100644
index 0000000000..bcaae0e605
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
deleted file mode 100644
index a8acf7a7ce..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
index ac88df9307..7882c19da8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix
index b19c22a55f..7ff9b1fc2e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
index 01995e9237..d0374c7490 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix
new file mode 100644
index 0000000000..f00980cdd9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
index 78d280b991..9f54350e4e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
+++ b/third_party/nixpkgs/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 = "2023.01.30.00";
+ version = "2023.02.06.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "sha256-p5IAbXPUrGtJotwabpEShNsUZNeF6ncHbDXaNabdaaY=";
+ 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/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
index 36bc4a2567..c298999229 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
index 776023f35f..8c12766204 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
index 68907d798e..48048e4a91 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
index 4000129f55..8b54cfb7b8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index 5e44d2221f..ca0e8f81c4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix
index 61106d7f62..5400c1de59 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/geos/3.9.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/3.9.nix
index fd0531fa74..415746d3e5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/geos/3.9.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix
index a331e02545..670fa30cb0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix
index ae5b9f4829..81f7abc90a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gettext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix
index 8fa77013e1..3f355deb33 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix
index 1e30eb744b..4cbd85e7a0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
index ac7977d0f6..9e932e547f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 780a3e091d..a3c2e46184 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix
index 8fc57d865f..69243a13ef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
index f1ec87ba00..4ab7360f1f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
index 4ab8cbbf96..f83b7c1081 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix
index 0d14630bda..590a4508c9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
index ec6646d98f..f993eeedc3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsmlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index 395708c2a6..e03f9f0b84 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index 41acd07958..80fc921a36 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix
index 049d202a71..1dd68b077b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
index 92a126bd7e..92fc02bfa2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
index 23680c9b67..88dfc54094 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index 1533f59b4a..6737cdd7e4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
index 447e7d061f..704a7c3e9c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
index 95e6e8d2e1..e824e1ed9c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix
index 849c3caf26..100e3e44a8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 782823cd67..7a9904f31d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix
index b29b64c2a7..e9bfe33e9f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hidapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix
index 5e6cef2aff..3d0ef7740e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/httplib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix
index 66441a9116..324b4337c8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/icu/63.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/63.nix
index 19838763f5..a83e2cd5f5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/icu/63.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/icu/base.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/base.nix
index a714e758bd..c5e46fa453 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/icu/base.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix
index 66092f4365..02707c750c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/iqueue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iqueue/default.nix
index 04fd7202d1..ab873f82c5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/iqueue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/irr1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irr1/default.nix
new file mode 100644
index 0000000000..8740919ce3
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix
new file mode 100644
index 0000000000..26b21aa7c9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/jpcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jpcre2/default.nix
new file mode 100644
index 0000000000..51fbba13ba
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index ac7f75f5e7..dcd7a76acb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
index c3d88103c2..fc58557021 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 98f7e178fb..9254043117 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
index 3edab9894b..6aa97206e3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
index 22b29151ca..4caea890e7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix
new file mode 100644
index 0000000000..bea9f86fc9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix
index 506be91932..bdc173507c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
index d81e3eeabe..bdd630103e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix
index 448a22f549..fd020603b5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
index b301ac13c2..56af027859 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix
index 7b08005133..d6917fe7f2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix
index 3a00ca498c..e2fbb3f928 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
index a0d6d8db3a..719f1b3e42 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libb2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libb2/default.nix
index a461f5039a..9e507188aa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libb2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
index 4b2c48824f..e5e51a447b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix
index d03783f2fd..11c8ce9e09 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix
index 7abbd944ed..8f8e33cbea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix
index da076a590e..6e38c1ab84 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
index 50fc23aa5f..821c739556 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/third_party/nixpkgs/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
index e12b584d16..19aa27b549 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
index 257673b1a9..57d30124a6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix
index 18b8d6ba5d..7cbcbe238e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix
new file mode 100644
index 0000000000..a83aa299b0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix
@@ -0,0 +1,41 @@
+{ 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 ];
+
+ prePatch = ''
+ substituteInPlace meson.build \
+ --replace "find_program('tool/gen-search-table.py')" "find_program('python3')" \
+ --replace "gen_search_table," "gen_search_table, '$src/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/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix
index b418279e47..6018e00f94 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix
index 196ac1afaa..8b35097778 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
index ac501c660b..e58c74f2c6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch
index b88245dfe8..e93a7ec765 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch
deleted file mode 100644
index 7b7e362fbf..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
index bf43bb1b50..0b983e6edf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
index 3f5a5961ba..775bcf2f2a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
index fcd7946a13..d8c5d87b16 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix
index 682ff485d6..c0d24cb3cd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libpgf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix
index 3dddc02aea..10a12dbfa7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix
index 758b00febf..26d7616ba8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libraw/unstable.nix b/third_party/nixpkgs/pkgs/development/libraries/libraw/unstable.nix
deleted file mode 100644
index 3f19bb53c4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix
index dd202d4a29..b1cb2fc457 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libssh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
index 892ed71583..f2147632eb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix
index bb49ad4472..cd8790c0e8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix
index 7da2c46faf..8c899268f7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
index c95ea31b3b..7a5fa8a34a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
index a350cd378b..8a86bc46d4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix
index 734f96850c..8db7964257 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix
index 3e61ee8a6a..f32ee43369 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix
@@ -1,18 +1,22 @@
-{ lib, stdenv, fetchurl, pkg-config, glib }:
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, glib
+, pkg-config
+}:
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 ];
-
- hardeningDisable = [ "format" ];
+ buildInputs = [ SDL glib ];
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix
index befbafd5a4..643dcb4d8f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix
index d82bf42bef..1d791aec6f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
index ca16063cca..bbbceab3ab 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
index 6578a86e35..3997ceb623 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix
index d3b7e56425..6ba8eaf6f1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix
index 568f3fbe64..8d6c0664ca 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
index d2e92da0ea..1c08812db4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 56fa74e5c0..52633a6d21 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
index ee05d2606d..c7977ed89d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix
index 6114c4c70d..3ba07c7b5b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix
index 6f3e73639b..0a74f9a386 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
index a697429569..324c5269df 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix
index 9b1635511e..5a2064eb59 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix
index 6317480782..e5b5d1acc0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix
index 3e98956147..0cc752d993 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openbabel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openbabel/default.nix
index a23382d3f8..fe12bbffa5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openbabel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
index 2c676e008f..4a9af9a538 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix
+++ b/third_party/nixpkgs/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
@@ -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"
'';
@@ -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/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix
new file mode 100644
index 0000000000..5a155a9119
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix
index 0460f01242..ce8064cdc1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opendbx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch
deleted file mode 100644
index 2acedda0e3..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 4c32299796..75ffe5ae06 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -10,6 +10,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 +20,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;
};
@@ -204,20 +205,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 +237,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 +249,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/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
index 46bbc079ae..9511f4f56f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
index 512398dde9..105a6b4953 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix
index a8d853a23b..b3ba508220 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
index 60b5a0b581..00f548806f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
index 991d2e661f..8b5f33599c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index 8da35364e2..53d465542b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix
index 207017b5ed..dfe2a6d7a9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qcoro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qcoro/default.nix
index 4a288702e2..fb5c7570b7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qcoro/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index 2829bb0be0..7d876d884b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 19f36c337e..0603ae077e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 44f7270185..b718f69610 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
index b52837aa17..1c39c00444 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix
index 5676f54d4f..a9c0723203 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
index b5324abd6c..a500e5dbc0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
index 057baafdc6..79cd1b86fa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
index 8ec90b1f1e..d475a9f9dc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
index 3fba6da7f5..fa60a4d3f9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index 114245b7d7..225236b0a9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
index 345a8c8d25..d10f7811cc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
index a083f57722..f22a72ac2b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix
index 1b83ba1e28..5128e17376 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix
index ee844bb417..87cf7d0819 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix
@@ -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/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
index f9a12322c4..afb8722874 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index c4faadd2a5..7144a17c18 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
index f040873028..962e8e8e6a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix
index ac22faeabb..dc53841121 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
index b9563346ad..3bf16057f8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix
index eeb1d14b91..fbd9db6a41 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix
index 9396a91444..a55c5fe573 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
index ae95fefe0e..c2fabae1c2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
index c31c705d39..09ca356ccd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
index 9f04cee386..e46be7a58e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
index bd4dc73c1e..8fc18d17a4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix
index 1ed1a05004..845e815be5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/swiftshader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
index 2c508a3735..28aabc0368 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
index fb52f75f8c..951a3f1d33 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix
index 21fddb1656..e0c48bc6dc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix
+++ b/third_party/nixpkgs/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";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix
index 9a534c4c14..774168847b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tevent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tevent/default.nix
index 568751f48a..7b798d00b0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tevent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix
index 76d8cc2ff5..92063eb140 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix
index da0554d49e..518ed432b7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
index 6f27a71b3e..e9f67a74f9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix
index 980d073f12..6189fcf016 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix
index 797c32cb6d..c7e8a361ee 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix
index b5184bafcb..d55d87f321 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/v8/8_x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix
index 7ca5080cb7..4b2117503b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wangle/default.nix
new file mode 100644
index 0000000000..2dc62f299f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
index d978e911c3..8a8c4ec059 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 99ee89edca..fdefeb86a0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -64,6 +64,7 @@
, enableGeoLocation ? true
, withLibsecret ? true
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, testers
}:
stdenv.mkDerivation (finalAttrs: {
@@ -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/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
index 5e8adaf0c4..8877365e1d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 9d03d193d8..8e0ebab220 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 543c6fb4e0..8dbc6f8706 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix
index bf2825b596..4370a27012 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/lisp-modules-new/ql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new/ql.nix
index aa04a8dce2..f65a55dae1 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules-new/ql.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix
index 3c4dc5194e..fd972aabce 100644
--- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
- version = "0.6.204";
+ version = "0.6.206";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MQF0mU1cpvkJ6VZE6A8J4W6DMS8RXhjLisrPkKParl4=";
+ sha256 = "sha256-9NyZaoZgHl0qyiJG2ZiarsXQy1o8fsbKGCpPBO/A1hY=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 75f393b3f9..d27c1bb1cd 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index f57a5c0842..cc99dfb297 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix
index 0df241ad37..0f89dbe934 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
index e4c3062cf5..fa2eeae00b 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 4c8a63a0a5..a42a9c2092 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index e51775b8c6..a0907881d1 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix b/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
index 4bef0ba2db..6120025d5e 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix
index 1ecf716329..1a10490443 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
index 006316295e..5fa482acc6 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
index b39cb471e4..0de51fbb57 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix
index 9375029f5f..f604780f47 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index 3111d4277c..1c7d72cbc3 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix
index 189359cd1c..32eef11936 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
index 6e77b6312f..ac294648d2 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
index e67429a6a4..d41e7c16ce 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
deleted file mode 100644
index fd209741b3..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildDunePackage
-, ocaml
-, tezos-stdlib
-, lwt
-, alcotest-lwt
-, tezos-test-helpers
-}:
-
-buildDunePackage {
- pname = "tezos-lwt-result-stdlib";
- inherit (tezos-stdlib) version useDune2;
- src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib";
-
- minimalOCamlVersion = "4.12";
-
- propagatedBuildInputs = [
- lwt
- ];
-
- checkInputs = [
- alcotest-lwt
- tezos-test-helpers
- ];
-
- doCheck = true;
-
- meta = tezos-stdlib.meta // {
- description = "Tezos: error-aware stdlib replacement";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
index dddbf8a790..e46374ee1c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix
index b2d319d7f4..c7c2d9fc32 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix
index 00aef53cc1..5366fb0786 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/Cython/trashcan.patch b/third_party/nixpkgs/pkgs/development/python-modules/Cython/trashcan.patch
new file mode 100644
index 0000000000..398422e76f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix
index b1b13bf581..c3b32bbc5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix
index d3712ba46c..6d32b95305 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix
index 982525e4bd..63a9987994 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aesedb/default.nix
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
index 81f73d324b..fa0611385b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.37";
+ 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-MFQiLOCqEAKzST7voMIQH0TYGuwICSVBcQZwUkk9S1Q=";
+ hash = "sha256-nhvFBXOoxCWaSjUdPyQP234URI50DM3ZoweRK9d1LIA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
index 9a302f5af0..56e5f8475c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix
index 728a666447..1cb1125839 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix
index 550c6d675e..42f8f3fb7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix
index 54979dbd7b..105ebc9188 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
index 82cdb3733b..c0d21eec56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 8e062db87e..6008b94179 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
index 6cae53c1bc..4c5ea71919 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix
index b3a65926d6..ce000ddb03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix
index ba1cbf0b7e..cfb41c7c1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -3,19 +3,21 @@
, fetchFromGitHub
, aiohttp
, prettytable
+, pythonOlder
}:
buildPythonPackage rec {
pname = "aiosomecomfort";
- version = "0.0.7";
-
+ version = "0.0.8";
format = "setuptools";
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "mkmer";
repo = "AIOSomecomfort";
rev = "refs/tags/${version}";
- hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA=";
+ 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/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix
index 59a2483d02..54c0f9132e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix
index 6351fea9bd..eda8e77e43 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
index 6d0a9d5eb2..ddbd7f1e28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
index 6a5802c388..06c56116de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
index a164cd284c..8c80631bc1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "angr";
- version = "9.2.37";
+ 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-sl3GzNMN90ez1Zks43B2How7QTaaJZbxOxK2hl/UzdQ=";
+ hash = "sha256-9/7GiF+Q7AUmKEqleVF8brCFSAqswalXxgPCApD19ZE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix
index d05d730a46..0ddd26b7ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "ansible-doctor";
- version = "1.4.8";
+ version = "2.0.0";
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-P2PC90coR+FpQkO+SUon72bDLTYJhZ5qbcOdCKuFFwE=";
};
pythonRelaxDeps = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
index dcf426b8d5..cc971f4321 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "ansible-lint";
- version = "6.12.1";
+ version = "6.13.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-u7GVOqVjuqJYfttu+pS/SAWEarAftZbnGMSPmnmpmok=";
+ hash = "sha256-4tRdgxVyn0Kcu+/atEbTgFCtezbZ46oewb6vKRTQKaA=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
index 066af243f6..e4e1f5873b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
index 7f7aff682b..87d33b235c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.37";
+ 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-WGc6FmrS0aVmiY5s8fUVHCT6cqcmj52H6FD2TR1HyK0=";
+ hash = "sha256-fpYoX5+TrZaozq7E3qBlhYUPrbbL3fb+wadQToLqtU0=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix
index 8d658d2c29..55da36c71c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "argh";
- version = "0.27.1";
+ version = "0.27.2";
src = fetchPypi {
inherit pname version;
- hash = "sha256-2wbZEIHxck40fM23iclXD+yUc351WvFZiDcpPgH8TNI=";
+ hash = "sha256-AMkCf29GG88kr+WZooG72ly9Xe5LZwW+++opOkyn0iE=";
};
nativeCheckInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix
index 5f27e8c131..6be8a76dec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix
index b0d2b1f723..686a9e92ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix
index ed434bcb6b..4bfd53c085 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix
index 2eb0e4986f..02f1a951d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix
index 7eab56d09b..ab74cf9666 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyauth/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyauth";
- version = "0.0.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/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix
index 7e3129b726..c5888f000e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix
index 947f5db4b3..187aaeeb99 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix
index 954e3df963..2c85cbfcf7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix
new file mode 100644
index 0000000000..f1b937f3ec
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
index ee7f9fd44f..e44dd89291 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix
index 1d8ce8d567..351a870750 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
index c22c0c9657..84bd82d94a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index a9bbef0e43..951bbaaab1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix
index 9d5ba8eaa8..82994b9d0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix
index 69bc78ddda..2a0e2183cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
index 1a4648d413..5d57084486 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
index fffdea592b..f8f33c0021 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix
index 2115eb273d..765c52dddc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
- version = "0.2.53";
+ version = "0.2.54";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
- sha256 = "sha256-V7FNuVXKJqIOsDqwg6Bn2Vb9QnuQ1XYzE4m0x2ipXW8=";
+ sha256 = "sha256-1MoC69klHIHMmvQSS8bnuEQGm6IloyzR0RcROIx0GNI=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix
index 69c663f9ce..308bba80b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix
index 44d6e6f978..bcdd7614ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
index ee36e10531..e6f78dfc0b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix
index 8c5be6384f..1a0ef99e74 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 6cd182e181..29feab25ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix
index 4fbe2ecd37..767071a75e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
index 966daaf1ea..c988ab49a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock
index ad3755638d..5e120ecc88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix
index 649edb7b41..b8ce9ce755 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
index 05ff5762bb..109a29ac79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.37";
+ 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-8kABsLp3Nrzjn7staiNfU6HdQTu1x6DNQzilMceqKVY=";
+ hash = "sha256-nKUp8N1T6fcXd1V9Ppqb5fFy8UHGPE/tiyHIanhgUoE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
index 8ed14ba28c..512d105914 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.37";
+ 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-vgH8UAR8B4l29RH0dwMlGVjOHgdcOTfLMHPiKN9Z36s=";
+ hash = "sha256-3B62NMlAGv4Q6HOkACafBETbOj4QsWsvfrTAM+5b9NY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
index b38d61f6fa..e1bd8e4f8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix
index 0e82989caa..1e3a554861 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix
index c51dd9ecc9..0dc799d7ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix
index c4d20c23d3..d1545d36b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix
index df12b6a98a..932e434d92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
index 9b7914e5b9..ed40735a20 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
index c546d11ec3..d47debe407 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
index 3fd18bd030..3ca704d106 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
index f859a43bd1..a43f1a5afb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datafusion/Cargo.lock.patch b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/Cargo.lock.patch
deleted file mode 100644
index e4e5eca8af..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix
index fb991dabf3..84afbfc3a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix
index b8f2fffe0e..09eff1461d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix
index e13da65aee..ccd426f94b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix
index 3e807d3bd2..d73d214598 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix
index 722e1a75f7..6b0f74f16b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix
index 74c8bdf9ec..e2188b70ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix
index ffde954907..6c0bc54c42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix
index 7fa3e68cab..0002118767 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix
index f6608aac9f..ed3cbb56eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix
new file mode 100644
index 0000000000..0b932de9a2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix
index 45aea2685d..f337d3ae8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix
index 47b2cafdb8..b384fb5cba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix
index fd4d4372e2..37f95807fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix
index 92c885907f..b5ee17918a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix
index 1b27129e9d..611f9b5622 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix
index fb5ead471a..5540c62a8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix
index d731aeb68a..c453cbf9a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix
index 4a4b380212..c0f4228593 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix
index 55e52c9c91..69bfbb4a65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix
new file mode 100644
index 0000000000..1413b352f0
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix
index 0c69d93ef3..65786ef0a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix
index ca48d44d34..8a47b9eeaa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix
index cac7233b9e..b816656a53 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix
index a520ce8c05..0834e967b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix
index cff900efbe..9053d83f0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix
index 60a7ee1abb..772e223c59 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix
index e6da0a1a6a..59db158b66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix
index 7b5b6c67cf..d550ea9862 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix
index f881ed5221..f54562742b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
index c4d1d300cc..3fd274a2c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
index eca45373fa..4853e7eb08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index ec4a1a93ca..315c0f8763 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix
index 739ace442b..b9c49e30a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix
index 65cae10f0e..fc822e1ece 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
index f23269a3b2..147fef19dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
- version = "2.7.1";
+ version = "2.8.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-4g97cqMwtSLhDOVwBrunsq+JQ33BfeKcP0fJP4N48d8=";
+ hash = "sha256-QOARAT1XSoW/PJli6BzNOZZJjiSubz8zqndEHZCCqag=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix
index 2b63ee846b..82522db24a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix
index fec7fac990..3e9430ef31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix
index 961e1a644b..20dd72b662 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix
index 304b567170..12b340639f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix
+++ b/third_party/nixpkgs/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 ];
@@ -87,8 +87,5 @@ buildPythonPackage rec {
homepage = "https://github.com/google/flax";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
- # Py3.10 requires orbax, tensorstore which needs packaging
- # Py3.11 requires tensorboard, which is unsupported at py3.11 atm
- broken = true; # At 2023-02-05
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix
index b46b1df541..825c7f1943 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
index fb2d0b1668..e1c22cd578 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix
index c6306da0ee..f2a772d1ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix
index c7ddc590d9..7f802a10b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
index 57f869842c..c04bb6e7f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix
index 6d3875d378..3676c1a4e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "goodwe";
- version = "0.2.24";
+ 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-dcz9IEPr5n86NHne9lEDB0kERY8o+jUEqPmz6QMEF4Q=";
+ sha256 = "sha256-RT8fkFHiqUaahowk6EDpaf8s4JUuHSHPNT0iEr/pDVg=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 41a9238d7a..be7f593418 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
index a8578492fb..64cdac603e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.17.2";
+ version = "2.17.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-VDhWYfAdU2PPzjSIhh0XMEnt9krogXV1fNTAFk6R3WM=";
+ hash = "sha256-sYF6yV/VENn11V74vWU2p/pSkPAfYPtW2l1TdHTSR2g=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 5a062f4a85..b9dfd63441 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 26446cc412..cefa183916 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 1c05367490..18c57e8898 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix
index 233d0bbbce..2678c0120b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix
new file mode 100644
index 0000000000..4e43915c86
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix
index 2d4fbf5064..65bbc142e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index c956d13994..9e38225571 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
index cfcd3b0605..df56ad4b8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "2023.2.5";
+ version = "2023.2.8";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-DD6DZzFuAGOSJZq7PM8yhJMXdEXw6LR6KR/f5XUVZ8Y=";
+ sha256 = "sha256-nlsmGIg4qBVDU7vjgl8aP9zkZgJCk3lAijFhQ+2pU80=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix
deleted file mode 100644
index aa61baa1b4..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix
index b68506ecd3..af74b15b02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix
new file mode 100644
index 0000000000..df7f447a04
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/histoprint/default.nix
new file mode 100644
index 0000000000..3c65fbf0eb
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index 8f109053b5..b60343dfc6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
index 30e1471727..06f7946b1e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index c5c199f505..a3a8cf93b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix
index 38c25fa1b0..a622017beb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix
index 7a1bd2356d..aed8e99e0f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix
index a02a110bb2..8b16d29274 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix
index 7b9910559b..1f0f799d58 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix
index a49f7c684a..173991f04d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 6eb64f79ed..deff4de058 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 2d705352d1..061b20a835 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix
index eebeb17bb7..97c224a39a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix
index d281ece246..496c984889 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/incomfort-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix
index 4c39d264ce..fc5eb2d12b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
- rev = "v${version}";
+ rev = "refs/tags/v${version}";
hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk=";
};
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
index a0a37ce92f..3ea584fbc0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
index 8d6677b046..4875e94c75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
index cfef001013..3e612c6cda 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix
index f5d4f12e30..6159d457b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_console";
- version = "6.4.4";
+ version = "6.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Fy9TNeMdYA32FhOpe38DUvLIJQu9EJLvLWWPdySfifs=";
+ sha256 = "sha256-Z+aPHaFrw/b3jthG3VVD7AZ5Np+FBHNPEL/SBvquOeo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix
index 465b865d66..fee502989b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix
index a5d4f2c86a..7bdac11538 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix
index 6578dc70a6..bb59fde718 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix
index 673d756946..bce1025301 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix
index e62b7cee01..0c2a44aa3e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix
@@ -3,12 +3,16 @@
, buildPythonPackage
, fetchFromGitHub
, unittestCheckHook
+, pythonOlder
, redis
}:
buildPythonPackage rec {
pname = "karton-core";
version = "5.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CERT-Polska";
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
index 621c5da5b6..986c7ec27b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
index 75523b6761..abc6ab5030 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix
index ac9c93ee1c..f85c756b81 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix
index 315054b10d..e5ddcf01be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix
index 53ae154857..a75bc1f59a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightning/default.nix
deleted file mode 100644
index f6d21f95db..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
index 428b199294..6f07c88548 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix
index cab862b20c..1b064d46b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "lupupy";
- version = "0.2.7";
+ version = "0.2.8";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-nSa/qFJUnk1QTwUqq2il0RWCPdF4Jwby9NPIwAwcVds=";
+ hash = "sha256-UIfv5lt9Vcyes9VYXkaQyBzfkcRiIE4It7q/CMJc7go=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix
index a8d1c18c47..193fca714a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/md-toc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix
index 44190b11e5..333f55ce42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix
index a76d3ff3ef..66bcc5f3df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix
index 104b9a9149..c29a75377d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix
index 5131fd0486..2e55edd7ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix
index 2a9fcd2010..7b557940d8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix
index 3aa8b02dc1..2cdfd2c0c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mox3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix
index fdeddeae06..78aa7eb6e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msgspec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/n3fit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/n3fit/default.nix
new file mode 100644
index 0000000000..5c8b06b74a
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix
index 9bf6f3c781..3ca143638c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix
index e9ec686b79..78fae4877a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipy/default.nix
index d5e399701d..9f600bdf86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nipy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix
index 4f1389a04a..e56e0957ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nomadnet";
- version = "0.3.2";
+ version = "0.3.3";
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-7EiAvWYhYJ7S/quME6B4Iw5nw+xOnL7PMCWXLPx0O+4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
index 4a1fc5ff3e..7ec78dab79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix
index 3c3c43c7ed..532add5a6a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
- version = "2.90.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/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
index b21f343db3..e3cd5bb092 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
+++ b/third_party/nixpkgs/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.13.0";
format = "setuptools";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4=";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-D8POBAkZVr0O5i4qsSuYRkDfL8WsDTqzgNACmmkFwGs=";
};
nativeBuildInputs = [
cmake
pythonRelaxDepsHook
+ pybind11
];
pythonRelaxDeps = [ "protobuf" ];
@@ -44,30 +51,36 @@ buildPythonPackage rec {
nativeCheckInputs = [
nbval
pytestCheckHook
- pytest-runner
tabulate
];
postPatch = ''
chmod +x tools/protoc-gen-mypy.sh.in
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)' ')'
'';
- # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
- # to lib64 and cmake incorrectly looks for the protobuf library in lib64
preConfigure = ''
+ # 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
@@ -76,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/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
index f514791fd0..baa1518244 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix
index c921feadd0..dc07fcffac 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix
index c0f2840763..689cd79033 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oralb-ble";
- version = "0.17.4";
+ 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-KvvcyeYXBtV/sUKMv+1xoXH9ALUX46EWS/STFZkCnUQ=";
+ hash = "sha256-Lwrr5XzU2pbx3cYkvYtHgXFhGnz3cMBnNFWCpuY3ltg=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix
index a714cd3a22..b48a5f2348 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix
index d981114b73..7d8443a14b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
index 9b35cb6ac1..881280a1fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix
index 4c5c0744b0..4837ffba7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix
index f23521ea21..47ef2faea9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index b9f8486aa5..61072507e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix
index 3e1776b97b..151389fbfd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
- version = "11.2.0";
+ version = "12.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-L4QUQsLdFwJPGq8ZdpTHRv5dNn1o6lc1q37LVNNCOOM=";
+ hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pefile/default.nix
index b1707670e7..55bd8c0cc0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pefile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
index 51f96c24ab..dca5566503 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix
index f265e24fe4..5424152a1e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix
index 9383bdbf10..8bcc740256 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "23.2.4";
+ 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-tunFd+hgaRx5wc1gRwZaNUEX550Rl1NR9rZfEWUw6H4=";
+ hash = "sha256-+oHqBopA2FLrDdxsVQhciW4ZXluZn+z05LmHtyDtFyI=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix
index 14c96e5734..d3d44259fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix
index 3b454eb240..a8d5d243a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
index a862fa69a9..a330a93928 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
index 2de176f2c6..3981f64645 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pyathena";
- version = "2.21.0";
+ version = "2.23.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-DhG8JdYVRrsRuXsmlUzp7HDRlBsI/pLMBDzYqIzmae4=";
+ hash = "sha256-6T2qr0fcHzgDPZvc3StZwIH2ZRvTOJFXDLPc3iFmwCQ=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix
index d492923f07..11332ecb6f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydanfossair/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix
index 9befc34acb..8d2d153ebb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix
deleted file mode 100644
index 3e12fbdf97..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
deleted file mode 100644
index 8c7db89d3b..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
index a6e3f5eb9a..e9cf439d36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch
new file mode 100644
index 0000000000..48727de251
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
index 63d445e092..8f02bcdbe8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
@@ -1,8 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
+, substituteAll
, pythonOlder
, cudatoolkit
+, addOpenGLRunpath
}:
buildPythonPackage rec {
@@ -15,6 +17,13 @@ buildPythonPackage rec {
sha256 = "b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd";
};
+ 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/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
index 49f4b06a5c..05b8793c73 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
similarity index 60%
rename from third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
index ea59fa0dc1..ff2a4a4323 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix
index 49e6abffd5..5cf5dd7910 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
index 02c69a4615..9e8fd5f789 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix
index b143a6c40f..464a2cfcc7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyrogram";
- version = "2.0.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/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
index b232a0bd8f..908fb0c8a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
index 9d6a3c6407..be281be33c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix
index 71fdfa2805..3b1c8fe2b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix
new file mode 100644
index 0000000000..1a8ee768fb
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix
index 0f3cd981ba..17d63fcc66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix
index 1c69f426b1..feae849013 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index a0e9bb1fb2..c6e8b7e915 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
index 725849fee0..358a647d52 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix
index d7dfee0863..e59781180b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 8c43d7a4ca..ade6acd85d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
index 5a5ac9f772..ac69e15ec7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix
index e162a4a6cb..b8594e51f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
index 20d7da5f48..4d56399d14 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.37";
+ version = "9.2.38";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-JGTfOE16tycBkbsihKPgSZPlfqun1vr/86kAlNwrSZA=";
+ hash = "sha256-9Cv0Quh0uN/DxOG1J2QCFb8fqRJTyovixmU8X721t8o=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix
index bd5b31869c..d4b3d70b72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix
index ce69f6c6c0..ec6bdb5d4f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix
index 634db03a3a..64798acad2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix
index b138449632..c03a4d01b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix
index 21053b8c75..8140226b4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix
index 38ff4bc434..b05a0428f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix
index da4a3846a9..6a223bb4fb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapt-ble/default.nix
new file mode 100644
index 0000000000..7c4f104c8c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix
index 92e5c680b7..a2c004fba7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix
new file mode 100644
index 0000000000..5a79b68e6b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix
index 321b3daec1..1a9c2b509f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
index 4a4707deda..5f3a22c3a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.3.4";
+ 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-Z1dhaGMbbg4xflJGcC6cZKCvTfB8+jDbgShMzI6T/xk=";
+ hash = "sha256-7XD8nmuja8BL66OCdflKWiKyR47TRXUjJLSmcgqSl8g=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 7f9091d87f..13bc07faed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix
index 0f2ffa7138..c2129a38bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix
index df3be2b3fe..4c8412e7f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix
@@ -19,10 +19,15 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
- rev = "v${version}";
+ 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/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index e01c1828fe..d81b055036 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
index 34ad5aa939..fda1e1896a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix
index ac6ca9c212..74c7a3c0ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index f0299b231b..4a89534c63 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index 94a4a2a14a..1764f56116 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix
index 05dfba9497..3d12618b8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index 15b001cf94..b5db5c2564 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
- version = "5.1.0";
+ version = "5.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-8tkdjj2qTzhUA8bNu2s49UgrLegrboNKMAs2NSOA5o4=";
+ hash = "sha256-wAjdCMWZhtzwWfu3dkhucLgtT6RqY8oQhdlLJojCjhk=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
index 8082fd9267..bbc7087ba2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
@@ -75,7 +75,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/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
index 73b5a5727a..9e3e1560c2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix
index ad934e71e3..1a07edc441 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix
index e9018c123d..6e66aa75b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix
index 2802ef080e..46e64ad15f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
index c64f36c8df..f1a8e72a59 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh
index 78151ae787..47aab0430a 100755
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix
index f3656aa0a4..f840b10e2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index a5ac20de3e..bbf1e9220b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh
index 807129f227..0807b00142 100755
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix
index afa862ab47..3c7aa4bb62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 7a46e5650b..282154f89d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh
index 44a9ba8ece..fcc8edd0fc 100755
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
index 1c191cc299..d09b5e7824 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.18.3";
+ version = "3.19.3";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M=";
+ sha256 = "sha256-03C6BPjVmsSTsJSIUnhyxonSqvTEc3ZkBw8xQeAIwWw=";
};
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix
index 1f8f402583..f67448c626 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
index 4d9223f7d9..6200298b3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "twitchapi";
- version = "3.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/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix
index 2e6343da31..12572eca0c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-dateutil";
- version = "2.8.19.6";
+ version = "2.8.19.7";
format = "setuptools";
src = fetchPypi {
pname = "types-python-dateutil";
inherit version;
- hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I=";
+ hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg=";
};
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix
index 862b8ff805..967d08fc0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix
index 710e1ad32c..25692d5ee8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pyyaml";
- version = "6.0.12.4";
+ version = "6.0.12.6";
format = "setuptools";
src = fetchPypi {
pname = "types-PyYAML";
inherit version;
- sha256 = "sha256-rebjKKWj34FsR8kSwuHpRq4rrOkHRKpzER7mg0sDoxQ=";
+ sha256 = "sha256-JOdrk41Y5oZFJx7rFJr2Ai0dqZeI5IH5Wb0oSxZPOaE=";
};
# Module doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix
index 8b16993877..e60c8a87c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
- version = "1.26.25.5";
+ version = "1.26.25.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-VjDleCRtFw2R6+OQF4jNKNU8TgRNwuJIjjsNVftoldg=";
+ hash = "sha256-NVhnJ8vXdRrMzywPNKiLr/wJL0NatiRY8Qd2RmWQ8tU=";
};
# Module doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix
new file mode 100644
index 0000000000..948f2108d2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/unicrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicrypto/default.nix
index 0bb9fc4e7b..5167bc8494 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/unicrypto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix
index be42bfc079..b50cd5eb83 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix
index c417cb47e2..38debb91be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/validphys2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix
index 480b72e2e5..74a29ae175 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix
index 1bd12d4a3d..11bf821e0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
index 40303c29f9..e50a91c060 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch
index 93db54b0c6..8e70f0069d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index 8735a37b21..3be508a0ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix
index 7815a36396..8dfbd41815 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
- version = "0.16.1";
+ version = "0.16.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-JsrOt6LmmhJZ4MBwLVKKt3IMbvAnxJx70AZROhb9gbc=";
+ hash = "sha256-yk3rEOcHIEZLz3qKxeGzHuVUWWxG3GhSt9vc0pXcanQ=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index 00df9fc517..d306f83220 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "xmlschema";
- version = "2.2.0";
+ version = "2.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "xmlschema";
rev = "refs/tags/v${version}";
- hash = "sha256-KK1F8OVK+19ZWwu+2UtTMiVNyPPoPOv3V1qJFZAu2h4=";
+ hash = "sha256-yF2L5VxUkqJjen5JeCQis4Q1o1KCJtRJ+S52wnS5VQg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix
index 3e2de3d2af..46f1904faf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "yalexs-ble";
- version = "1.12.8";
+ version = "1.12.12";
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-CO+plbsZzQkxtvz8N3QP71P2V1wPdyp1oeW/424mZks=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix
index ac8c68239b..82d575d45a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "yfinance";
- version = "0.2.10";
+ 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-1LRnvyr3QNYR33qTyN/WepGH8InYmXWwO5gQfm20MP4=";
+ hash = "sha256-Lp8HqXq4PhvpTzFbldk70pU03+qsHzGeHIkaPdedvRo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/third_party/nixpkgs/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch
new file mode 100644
index 0000000000..93db54b0c6
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python2-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/wheel/default.nix
new file mode 100644
index 0000000000..8735a37b21
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
index 4672bad4ca..aa903a5637 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
index 4799814198..21c4765abf 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix
index 4556b4360d..55624ef369 100644
--- a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/allure/default.nix b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix
index 07ca36be34..dfc82c78d3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index 0a9cefb57b..0f560d0b3a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
index 51fd3aefa8..1a8183ebab 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
index 449d5b6b5e..5c0a96e5d8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/rr/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
index e9437d718c..40a7909f34 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/rr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index bb3d37f4f8..df6a7976de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
index 3bec558803..9949ec7ec7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix b/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix
index 82571293ab..f9bed90f8b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/bbin/default.nix b/third_party/nixpkgs/pkgs/development/tools/bbin/default.nix
index 606633fd3a..d095684509 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix
index 610b991ec5..819cccf95c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix b/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix
index d1839eb86f..49780a7772 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix
index 79c7962865..7508e77da9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
index b371a1f111..90e5098a36 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix
index 9775665869..cad1e0d47f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
index d94dccf7fb..d283e1e321 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/002-application-services.diff
index 7c77336b41..56f7cd266b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/002-application-services.diff
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 0a1e191ba3..2aff749ebc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
index 5591b16342..d0306dd33a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/disable-bitcode.patch
new file mode 100644
index 0000000000..a72997c104
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
index 8fcb5f2dba..4e42927d02 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix
index 30d22bc183..e5f017de1e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix
@@ -5,19 +5,19 @@
}:
buildGoModule rec {
pname = "coder";
- version = "0.16.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-3rGpyJzGkZYUEvKKDzj2I5sqrUImmmX7cXWM9UClPLY=";
+ hash = "sha256-FHBaefwSGZXwn1jdU7zK8WhwjarknvyeUJTlhmk/hPM=";
};
# integration tests require network access
doCheck = false;
- vendorHash = "sha256-bb9jBno7elO6qKGjacpX3rxgrpJpGpTxMQtdBYjBzMk=";
+ vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
index 9da2276010..13d99813c7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix
index 9e5dc5628b..4524224cd6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
index 20ba407e3d..fbdcbcde7c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
index 143362d98a..1fbd2fcf99 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 14984ba951..29d9412137 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/cosmoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/cosmoc/default.nix
deleted file mode 100644
index e64cf02e9f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/cosmocc/default.nix b/third_party/nixpkgs/pkgs/development/tools/cosmocc/default.nix
new file mode 100644
index 0000000000..71028d1a19
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix
index 5bfdb06600..fe4108840c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
index eee9538628..caa0150d4b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix
index 34a7a166ef..c204e91b27 100644
--- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
index 2921a7b394..2f111370d2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gci/default.nix b/third_party/nixpkgs/pkgs/development/tools/gci/default.nix
index 170b9c41dc..0dfd153e21 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gci/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix
index 230c38ed44..27d51b195f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage rec {
- version = "0.32.1";
+ version = "0.32.2";
pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
rev = "refs/tags/v${version}";
- sha256 = "sha256-ts2OGRdz1ajJ36XXUC48Jkygr3LDdZfHJ88peJkjqbg=";
+ sha256 = "sha256-w2zGiRvhuPMo79UsnckSISyCwBcIg5sfXIJLmnT3Tnk=";
};
- cargoHash = "sha256-b54/65xYZ9a04dPm90R9tzhdjTwTaXvi4NnQe9k+qvE=";
+ cargoHash = "sha256-8P62yQpGXgswfSnAji0cIJwarx8IW0S5DO5gUMMp5PI=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix
index fcebe93aaa..06016bec25 100644
--- a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
index 5be71b1fd5..ab6723bebb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
- version = "2.18.0";
+ version = "2.20.0";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
- sha256 = "sha256-Iut45RobHc3KZ0vzOqmQT0F8A/GSP5KCfprnmB3zFAA=";
+ sha256 = "sha256-lWh0aX+VuSL0w592lNqXpwHq/b2WeDyYiBzm224qnzc=";
};
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix
index 5732b8f44f..d0c85be473 100644
--- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix b/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix
index f2cf1f8a48..245f86788a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
index 84f221f7af..2bb15698e0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
index 2a1197cae0..0eeeba6fa7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix
index 31d6d281ba..a64fab3353 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix
index cbb8b38d80..61fe400586 100644
--- a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix
index 28c8044465..6136c5b6cb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix
index d260e7601e..04b5fd6e1e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lua-language-server";
- version = "3.6.10";
+ version = "3.6.11";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = version;
- sha256 = "sha256-QnkWEf1Uv+CZwEyv1b3WMPvaOZEn+mKH5w3CPyw02CQ=";
+ sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M=";
fetchSubmodules = true;
};
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
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; [ figsoda sei40kr ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/third_party/nixpkgs/pkgs/development/tools/lightningcss/default.nix b/third_party/nixpkgs/pkgs/development/tools/lightningcss/default.nix
index c2bb6828bc..132faaa4ae 100644
--- a/third_party/nixpkgs/pkgs/development/tools/lightningcss/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix
index a7c8c1f8db..9a4c95706f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/build-components-separately.patch
deleted file mode 100644
index 0b4162d848..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
index 39e852a60b..208b404f1e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch
deleted file mode 100644
index 5f1293f8f7..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libbfd.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libbfd.nix
index 16737a7b5e..dca62b82ee 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libbfd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libopcodes.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libopcodes.nix
index e4b6cec41b..e067282a0e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/libopcodes.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch
new file mode 100644
index 0000000000..562aad33ec
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
index b657a9ded9..741edcc748 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.23334";
+ version = "0.1.23391";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1+PcjameB9/1MoyM0RAxrhuE649INyLlhgxA5xJQ9Pw=";
+ sha256 = "sha256-mTqrckoYbxtlwonXp6mtbXSpmVB3WfSXaOkyycBVjx0=";
};
- vendorHash = "sha256-E24b8PUA1Hy+OepQe2n6TecCMKKicdr5KUdiJ663Td0=";
+ vendorHash = "sha256-7k5jmXvNtxezialavNz8NM7esl2vpXcjRW2n/9GAycs=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
index 6c2799cfad..5c7720a202 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
index 27ff1b5e69..b7270f79c4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix
index ec65ca62fa..2203863264 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/edb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/gperf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
index 71b0bbd0b0..d836e5a973 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
index 1d25dc8c6e..5c54941b90 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
index eaaa7bed5a..1fd09e8780 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
index ec9fb436f7..39b6baabc8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix
index 1c049eac7a..6eeb47df10 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 095af77691..18ea26ca22 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -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/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix
index 8ce09c8e39..10d99906b4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
- version = "14.2.4";
+ version = "14.2.7";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-4o0Z3xXsVTr2dE5td/i2uQoaqsBGOMSrzt2X6C9gYbA=";
+ hash = "sha256-x+hSsN/STJYbyGRCQJ70T3FMKfe1aJaqiK+KT0eNpwE=";
};
- vendorHash = "sha256-ehG71B351u+LoXDuKQkuEdEpUdHslVU2HcPKUz6FAnQ=";
+ vendorHash = "sha256-rLPL2kGIPR/paY3mLXsqMgvTe7EgQPmg3EqXrLjlFPk=";
sourceRoot = "source/src";
diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
index 7a50b2df24..b9f549693d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
- version = "2.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/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 13ba669bb4..8fcb696ac7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix
index f76e0287b5..ecd80d6260 100644
--- a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index dd1e2640a5..424e93c934 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index 36a66d091a..60a45f606f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
index 84f1670e6d..8799fbd62d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix b/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix
index d0b0000e59..ee53089515 100644
--- a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix
index 21e77ce5f4..30d4c5a81e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix
new file mode 100644
index 0000000000..5705b9039b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix
new file mode 100644
index 0000000000..30a73522c1
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix
index 359f5dbe64..1f26f23e15 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix
+++ b/third_party/nixpkgs/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.0";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4=";
+ sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE=";
};
- cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0=";
+ cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc=";
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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index 79822a7735..02b2ea5430 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
index 80fbfe249d..2f5556ec0a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
- version = "2023-01-30";
- cargoSha256 = "sha256-ONziMXbMPDoIb44mOJCg5O1QOo5o13kaGb+b6Qp3Ikk=";
+ version = "2023-02-06";
+ cargoSha256 = "sha256-TYMK905P5FvDxWo3ntDjNsgYxz+tBQptxWh5p6OKE64=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
- sha256 = "sha256-W8abw+8SuxSMMBH4ydfawdC6zwPHQwhHerFEXkB4oU4=";
+ sha256 = "sha256-apIUZwMwZkWqd7anSGcI1g+2rYfd5GoxIpFFabUFYBU=";
};
auditable = true; # TODO: remove when this is the default
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
index d7c4aaa39e..6f9466b60d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/squawk/correct-Cargo.lock.patch b/third_party/nixpkgs/pkgs/development/tools/squawk/correct-Cargo.lock.patch
new file mode 100644
index 0000000000..431f004d2d
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix
new file mode 100644
index 0000000000..9649625c17
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch b/third_party/nixpkgs/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch
new file mode 100644
index 0000000000..205fd3dba9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix
index 19187643d1..60110d6c99 100644
--- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix
index 983e91e62e..97178734de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
index 17e8983019..efc1610955 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/watchman/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/watchman/Cargo.lock
new file mode 100644
index 0000000000..9554b7be1f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix b/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix
index 2acbf13e27..7a042ac8bc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix
new file mode 100644
index 0000000000..3440c0f947
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix
index 7a5470a334..4ec4403987 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix
index 5bcdc41028..3b294c4c80 100644
--- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix
@@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
- version = "0.5.5";
+ 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 = "n7OfH93qXfu8608mMJ1tMoe9rAngu0cSHflwJZlKPYU=";
+ sha256 = "0LEoOwsZrEV819UpdwHaIRk9vT14JMDiXghUMf3fEoY=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
- sha256 = "YPX5+wfXumYSvdjSOgb0rc/RrIU9vMYEqQmhObsg3ak=";
+ 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 = "yiCpnO9Y8+m4fGIVyKyxeXMBe0e8qxoTAgOB8HHH4Nw=";
+ sha256 = "VJyv92H18wsp9F3zwu1KwwjNE1qGBCHVj7vnmnb2RbI=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
- sha256 = "4eziS6QRQzg/KyKrgAmyOrMxXb+YH2pNX1RX4dL/zhM=";
+ sha256 = "Sdj/hdGaMvqN35N7tnAgvPQPELeW2IHA3uCVyTLYPw0=";
};
};
updateScript = writeShellScript "update-bun" ''
diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
index e12230f453..b19e2e7a28 100644
--- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix b/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix
new file mode 100644
index 0000000000..71e01aca94
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix
index 1a8b232c28..6c76811d0c 100644
--- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix b/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix
index 792eba3978..10dd7950f9 100644
--- a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix
index fa6dcbf28a..86accf5977 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix
+++ b/third_party/nixpkgs/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 {
diff --git a/third_party/nixpkgs/pkgs/games/beret/use-home-dir.patch b/third_party/nixpkgs/pkgs/games/beret/use-home-dir.patch
deleted file mode 100644
index c8597a0303..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix
index 3bf2f884ab..da84422308 100644
--- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix b/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
index 23eb6e96dc..a4943187dd 100644
--- a/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/chessx/default.nix b/third_party/nixpkgs/pkgs/games/chessx/default.nix
index fd8189386e..8a316438a6 100644
--- a/third_party/nixpkgs/pkgs/games/chessx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/eboard/default.nix b/third_party/nixpkgs/pkgs/games/eboard/default.nix
index 293811e9b0..81bc6d365a 100644
--- a/third_party/nixpkgs/pkgs/games/eboard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix
index a65ce6bac0..41dd9625ad 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix
index e1b15b6248..30ba8eaabe 100644
--- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/gimx/default.nix b/third_party/nixpkgs/pkgs/games/gimx/default.nix
index 785d38a759..410228c4f0 100644
--- a/third_party/nixpkgs/pkgs/games/gimx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/liquidwar/default.nix b/third_party/nixpkgs/pkgs/games/liquidwar/default.nix
index e012886c88..9d9e424345 100644
--- a/third_party/nixpkgs/pkgs/games/liquidwar/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/oilrush/default.nix b/third_party/nixpkgs/pkgs/games/oilrush/default.nix
index b78baee725..947b7141b5 100644
--- a/third_party/nixpkgs/pkgs/games/oilrush/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix
index 389f59f91a..8df88c92ff 100644
--- a/third_party/nixpkgs/pkgs/games/openmw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/openrct2/default.nix b/third_party/nixpkgs/pkgs/games/openrct2/default.nix
index d474b0eae9..10914d4107 100644
--- a/third_party/nixpkgs/pkgs/games/openrct2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix
index d22d7fce17..7a62db1003 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
index a633bfb954..3a56c35fe8 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
index 863c830e80..908140259b 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix
index 752181581f..1b022ff6e1 100644
--- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
index 1f051242ad..cc8b864c1f 100644
--- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/stepmania/default.nix b/third_party/nixpkgs/pkgs/games/stepmania/default.nix
index 2445ee9096..6cb7a23dff 100644
--- a/third_party/nixpkgs/pkgs/games/stepmania/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/supertux/default.nix b/third_party/nixpkgs/pkgs/games/supertux/default.nix
index 679500f974..857617bc4b 100644
--- a/third_party/nixpkgs/pkgs/games/supertux/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix
index 97976f9d66..7849de17cf 100644
--- a/third_party/nixpkgs/pkgs/games/unciv/default.nix
+++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "4.4.11";
+ version = "4.4.13-gp";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- hash = "sha256-UvTEqptA9Dp1wdri12sAYDB6rjiZCvk2tiG5i0AWU78=";
+ hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/games/xjump/default.nix b/third_party/nixpkgs/pkgs/games/xjump/default.nix
index 3c13fc1a9b..2c56e0bba4 100644
--- a/third_party/nixpkgs/pkgs/games/xjump/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/zod/default.nix b/third_party/nixpkgs/pkgs/games/zod/default.nix
index 737fed1e7f..e0c2031dde 100644
--- a/third_party/nixpkgs/pkgs/games/zod/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index 3347030174..eaba99839f 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix
index 1a737ae3ab..d2eb7ea3a4 100644
--- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "fastly";
- version = "6.0.0";
+ version = "6.0.3";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
- hash = "sha256-meUKWAFKT6EgHtzgR6jjDCA8EUD1kVoT3reXaRheukw=";
+ 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,
diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix
index 441f3ccb37..fce51aabd2 100644
--- a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix
index ba77e9c3c9..4e7375a269 100644
--- a/third_party/nixpkgs/pkgs/misc/jackaudio/jack1.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix b/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix
index 966a451c06..88ed7a4772 100644
--- a/third_party/nixpkgs/pkgs/misc/source-and-tags/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
index 42d7021f34..a360058725 100644
--- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix
index 6d1929ef98..ec98a0b1cf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
index d8fc464802..560f2bf301 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-lib";
- version = "1.2.7.2";
+ version = "1.2.8";
src = fetchurl {
url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
- hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8=";
+ hash = "sha256-GrAbdOM0JcqZwuNsCET9aIgnMZO9iYJA/o+TrMvL80c=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
index 512fe605b6..4568ecf1e7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
index 2a98aa82eb..9c41a217ba 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
index 47f76649de..808d1bc423 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix
index 886bf3e6fe..8312d64acd 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix
index 583bd4115a..c6bf684f7f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
index e882ddd69b..a2229a0a60 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
index 8fb8268337..d7a13faf4a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix
index a116aef792..6aa369e4eb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
index 34fbde9d67..a64787cac1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix
index 198cd86816..efc64e81af 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index db4c5b76c4..5bc0f53c46 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -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.166-hardened1.patch",
- "sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.166-hardened1/linux-hardened-5.10.166-hardened1.patch"
+ "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": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80",
- "version": "5.10.166"
+ "sha256": "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq",
+ "version": "5.10.167"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.15.91-hardened1.patch",
- "sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.91-hardened1/linux-hardened-5.15.91-hardened1.patch"
+ "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": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56",
- "version": "5.15.91"
+ "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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
index b9e6145bcf..394883e2de 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.92";
+ 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 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";
+ sha256 = "0wjsqvhp0jnisypb8yw6dncyp5k7zxbhjivh7jqivpsdwvdp14ns";
};
} // (args.argsOverride or { }))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix
index ff5793009c..4c7249f2b4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "6.1.10";
+ 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 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb";
+ sha256 = "1spdl3i69qwn7cywzs6kql8nlisdnmnwk9za7v4xq1092xsscynl";
};
} // (args.argsOverride or { }))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
index e0290a2aec..7e3ffb4720 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "19044";
- sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m";
+ rev = "19049";
+ sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
}
, ...
}:
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index 15ddf9df91..9197f7d248 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
index 310178b9a1..18c32930f3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 3610fe38f5..2745cd780f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "6.1.10"; #zen
+ version = "6.1.12"; #zen
suffix = "zen1"; #zen
- sha256 = "0dfn449v3lzz1clxbsypakd0sfii9iycy1hq9x52fr9xf8wy3cxk"; #zen
+ sha256 = "16g0rkgmxbj4425mbnadam7vbd8621ar13ddx26j298bc9m8yqic"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.1.10"; #lqx
+ version = "6.1.12"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "1ka94z0wvq90vfzd4ncjrzk5xcb5gvaldaph7mc25jxgh6pal822"; #lqx
+ sha256 = "0a6slrydf47hk4b3xlxycjw9y2xgjgvzjic2psbcb1c5y75zq720"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
index 3683522f04..83ad98d1b1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix
index 925901d226..efde55d651 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix
index c8ed8283ab..7a0fabf9d4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix
index ee29180a8d..17d0c69382 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
index df9aca8e24..40ac5eb65b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ocf-resource-agents/default.nix
index 8d7f2b5271..976c5f1779 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ocf-resource-agents/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
index 3aeef46255..7cb364597b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix
index bca58bd808..b5f9d8a0a2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
index 20db1cdd74..60a55096b4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix
index 63de745393..ecb0fe535d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix
index 5e956f3baf..6fc6e0012b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
index 0f2e00c838..ecfd6a87e6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix
index e50129f1e2..a89eb3702e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix
index 4aa408eec4..be4b954c1b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix
index 84ad6a314e..bd682ec593 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix
index dd0b32c538..d8825f0189 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix
index 6a0da0c5e1..7ba338d378 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
index 674af264c3..476bce22fb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix
index edc2d5bc44..35b068fd8d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix
index 38ded6041f..d3560aca91 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
index 80c14a0b38..a2f7ca0e81 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index e871d6618c..b03f3c3c16 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix
index 162ae766a8..73c579288b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/solo5/0001-Fix-test.patch b/third_party/nixpkgs/pkgs/os-specific/solo5/0001-Fix-test.patch
new file mode 100644
index 0000000000..bd01c129be
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix
index c449e46a99..c436f24786 100644
--- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index bf1e73f67b..091897b693 100644
--- a/third_party/nixpkgs/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix
index a54b5a23cd..cb84adf1e7 100644
--- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix
index 867ba69077..3345619bc9 100644
--- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh b/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh
index 8a72bd5a7c..b7defa8113 100755
--- a/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix
index 9b75d1e0db..40c267b00e 100644
--- a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/akkoma/pleroma-fe/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix
similarity index 81%
rename from third_party/nixpkgs/pkgs/servers/akkoma/pleroma-fe/default.nix
rename to third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix
index 71f3bcd8ae..a1f2c43d79 100644
--- a/third_party/nixpkgs/pkgs/servers/akkoma/pleroma-fe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/akkoma/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/default.nix
index 5df95623da..2b2e73e31c 100644
--- a/third_party/nixpkgs/pkgs/servers/akkoma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/akkoma/mix.nix b/third_party/nixpkgs/pkgs/servers/akkoma/mix.nix
index f26d96c0f2..27d88ec7b9 100644
--- a/third_party/nixpkgs/pkgs/servers/akkoma/mix.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix
index b52b0fb022..5bfb2881c4 100644
--- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix
index 2c2f153626..b4cd637d3d 100644
--- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix
@@ -7,12 +7,12 @@
, installShellFiles
}:
let
- version = "2.6.3";
+ version = "2.6.4";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
rev = "v${version}";
- sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
+ hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
};
in
buildGoModule {
@@ -23,10 +23,10 @@ buildGoModule {
owner = "caddyserver";
repo = "caddy";
rev = "v${version}";
- sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k=";
+ hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0=";
};
- vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s=";
+ vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM=";
subPackages = [ "cmd/caddy" ];
diff --git a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
index fbbda3837b..d466948890 100644
--- a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
index bb9ae3ced4..514e9cbbe0 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/etebase/default.nix b/third_party/nixpkgs/pkgs/servers/etebase/default.nix
index 079b87fe9a..1b50e3cbe4 100644
--- a/third_party/nixpkgs/pkgs/servers/etebase/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/filtron/default.nix b/third_party/nixpkgs/pkgs/servers/filtron/default.nix
index fccc1ba001..f50e3b1958 100644
--- a/third_party/nixpkgs/pkgs/servers/filtron/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/filtron/deps.nix b/third_party/nixpkgs/pkgs/servers/filtron/deps.nix
deleted file mode 100644
index 61320f868d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix
index 9d65198c8c..436f0a7fc4 100644
--- a/third_party/nixpkgs/pkgs/servers/foundationdb/cmake.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix
index 354412a4b7..351f54f21d 100644
--- a/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/deps.nix b/third_party/nixpkgs/pkgs/servers/gemini/molly-brown/deps.nix
deleted file mode 100644
index 95427e8f79..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 8abe197bee..dafb5b4976 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2023.2.3";
+ version = "2023.2.5";
components = {
"3_day_blinds" = ps: with ps; [
];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index 94ab3ab5b5..4d6e0b6cca 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/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.3";
+ 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-cRdxlmlgkKTnrtqGQPbSpBLHf+vfI9T6sdETcGshN9M=";
+ hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix
index aed6a36be1..4a219a9cfb 100644
--- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 06fa127256..f882b782bc 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
index 971e04dcd3..d09c98ef2a 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/imaginary/default.nix b/third_party/nixpkgs/pkgs/servers/imaginary/default.nix
index cfab6e2e90..8ab50dc957 100644
--- a/third_party/nixpkgs/pkgs/servers/imaginary/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
index ae8b8eacab..c7e82cd8c1 100644
--- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.3004";
+ version = "0.20.3063";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha512-UNGkcCQeeMxonJ9Kf1SDMTgSC8uTM2gD377qA+ViSfpWoOGQCY003EZ0c3c0q6oSGVbiIma1wvyW/T/ILLi5yw==";
+ hash = "sha512-ROp2nKfXD9OWsgEUz7lhqVusIBBMHUhaPOp3g4F/25bAN0vl5E0Mm4m3V9ChvFV6otlxfZJEByBlsC+aALxbyg==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix b/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix
index df3d7cf870..fa0296c55e 100644
--- a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix
index 098fdb6e02..c4a3a918d3 100644
--- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "libreddit";
- version = "0.29.0";
+ version = "0.29.2";
src = fetchFromGitHub {
owner = "libreddit";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-ZH1mtFfbM+acEY1oyoFXPltgPbtgI1kzoO59op1zZfo=";
+ hash = "sha256-YCjH0K84sPgQ9MtA5IUHoGCxrAzRSu4KIuk2qPyhaM4=";
};
- cargoHash = "sha256-2DBptAvJ0J65AehgHG7f4JZf1QA4ZXn8dqG09wcXsiU=";
+ cargoHash = "sha256-VsQckZm8ySmbpn1uSgxWqZ+cc+NnUDNBmSsj4MHdQtk=";
buildInputs = lib.optionals stdenv.isDarwin [
Security
diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix
index cd407ef37e..1a911668a5 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix b/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix
index 93b85cee6b..63447dffb3 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/vsmtp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix
index d0bb07c738..d942bb0b2e 100644
--- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix
index c01eaaa5a5..5c1a1e3d98 100644
--- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix
index 8ab2543e47..891e96d684 100644
--- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mastodon/version.nix b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix
index b79176c23c..c283b30007 100644
--- a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix
+++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix
@@ -1 +1 @@
-"4.0.2"
+"4.1.0"
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index 0c42373dd2..9253b93945 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
index 8716de1f1d..d96e60ba78 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
index 385fd1a784..9b5f2c8131 100644
--- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix
index 8c63b0fb94..770ca8c76e 100644
--- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-packages.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-packages.nix
index e3d35ef909..7392bf815b 100644
--- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/misc/navidrome/update.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/update.nix
index c559aa3185..124fbed461 100644
--- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/update.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
index 4162ea9d6c..72c18cd6d2 100644
--- a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix
index 952a9f94ce..e356b914c3 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
index a58ec2bf7b..edf82742bc 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
index 5f951f308d..17775b491c 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
index f1044ca4f8..95fd5135b4 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/composition.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/composition.nix
deleted file mode 100644
index ca76a98f5a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix
index 943ee9ce15..a5e11ac8a1 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-env.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-env.nix
deleted file mode 100644
index 5dad9ec63d..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/update.sh b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/update.sh
deleted file mode 100755
index 3bc5fb5588..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix
index c46568d24d..73595e6909 100644
--- a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
index 1ca26d9f03..76cbb2730c 100644
--- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nats-server";
- version = "2.9.12";
+ version = "2.9.14";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
- hash = "sha256-IhzbtTH8Vr+Z1Z9Xzz/CbmxDaR6ygdebEqz2ELa4N3E=";
+ hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI=";
};
vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo=";
diff --git a/third_party/nixpkgs/pkgs/servers/nfd/default.nix b/third_party/nixpkgs/pkgs/servers/nfd/default.nix
index 58c4dd4293..87ce4ce188 100644
--- a/third_party/nixpkgs/pkgs/servers/nfd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix
index 77f4aa5a30..c89d3f789e 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
index 185c246e6f..a80975926e 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix
index 41bba89996..4f86cc4da5 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix
index d6e2f20ecd..8ebed1c274 100644
--- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix b/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix
index ed163f2547..cddda5d399 100644
--- a/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch b/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch
deleted file mode 100644
index 07b224b1f0..0000000000
--- a/third_party/nixpkgs/pkgs/servers/pleroma/0001-move-result-into-with-guard.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8af53101fbeb0d4855ffa2b33069e833abf2e825 Mon Sep 17 00:00:00 2001
-From: Finn Behrens
-Date: Tue, 7 Dec 2021 09:18:53 +0100
-Subject: [PATCH] move result into with guard
-
----
- lib/pleroma/web/activity_pub/publisher.ex | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex
-index 4f29a44..849b359 100644
---- a/lib/pleroma/web/activity_pub/publisher.ex
-+++ b/lib/pleroma/web/activity_pub/publisher.ex
-@@ -63,8 +63,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa
- date: date
- })
-
-- with {:ok, %{status: code}} when code in 200..299 <-
-- result =
-+ with {:ok, %{status: code}} = result when code in 200..299 <-
- HTTP.post(
- inbox,
- json,
---
-2.34.0
-
diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/servers/pounce/default.nix
index e03d6e6827..7ad43825b1 100644
--- a/third_party/nixpkgs/pkgs/servers/pounce/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix
index 57977ebf40..0c15e21f5a 100644
--- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/roapi/http.nix b/third_party/nixpkgs/pkgs/servers/roapi/http.nix
index 775850ea32..7edc3dd89b 100644
--- a/third_party/nixpkgs/pkgs/servers/roapi/http.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
index 3f657bbece..4828e61359 100644
--- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix
@@ -20,9 +20,12 @@
, gnutls
, systemd
, samba
+, talloc
, jansson
+, ldb
, libtasn1
, tdb
+, tevent
, libxcrypt
, cmocka
, rpcsvc-proto
@@ -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/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix b/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix
index db20f0e920..b49be53ec2 100644
--- a/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/search/khoj/default.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "khoj";
- version = "0.2.5";
+ version = "0.2.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "debanjum";
repo = "khoj";
- rev = version;
- hash = "sha256-cylZNRyHMFJiBjlEtKMpRjRjwQyb7pgOjMtxFhKFU4k=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-QcxP+USj7vlLKPno2mV53nFonZM38VzL8D4zY6d8y3k=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix
new file mode 100644
index 0000000000..b8274d894b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/search/opensearch/opensearch-home-fix.patch b/third_party/nixpkgs/pkgs/servers/search/opensearch/opensearch-home-fix.patch
new file mode 100644
index 0000000000..25d0130d6d
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix
index dd08098b8a..89924ffd83 100644
--- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "snappymail";
- version = "2.25.3";
+ version = "2.26.0";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
- sha256 = "sha256-FK0F1STRdE1Ny+l0ILQMofXSXDhyzoMgZCT+MuCSmcA=";
+ sha256 = "sha256-CNT03pqk0viHymLcmuhb25io9V3cL29y30Bz4TJ9jJY=";
};
sourceRoot = "snappymail";
diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix
index b3d898dde6..ee6cb17ff0 100644
--- a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
index fe3e3fba8d..11ab668d63 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
@@ -241,43 +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.2";
- hash = "sha256-V8vQESsitZL2V81OuC4vNq2QE1Exe/jheElXjoA/PLI=";
+ version = "10.10.3";
+ hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix
index 93df798c8b..c5e08b8279 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index e437de887c..eaf631b4a8 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix
index 492f323d38..0e0c84e97d 100644
--- a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
index b936fd3162..75adec85e5 100644
--- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix b/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix
index 833d31de40..325632da48 100644
--- a/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
index 19d23531f6..a60c068541 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 0907d81417..e46d8e750a 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index b0530977f7..d0a2ec8812 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 9a82416d30..dd09fbba34 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/bash/5.nix b/third_party/nixpkgs/pkgs/shells/bash/5.nix
index 7735243d3b..932e81a517 100644
--- a/third_party/nixpkgs/pkgs/shells/bash/5.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/hilbish/default.nix b/third_party/nixpkgs/pkgs/shells/hilbish/default.nix
index c1980309e1..20e1331dbc 100644
--- a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix b/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix
new file mode 100644
index 0000000000..98125cd4b4
--- /dev/null
+++ b/third_party/nixpkgs/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.0.2";
+
+ src = fetchFromGitHub {
+ owner = "MercuryTechnologies";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-W3MeApvqO3hBaHWu6vyrR6pniEMMKiXTAQ0bhUPbpx8=";
+ };
+
+ cargoSha256 = "sha256-M6yj4jTTWnembVX51/Xz+JtKhWJsmQ7SpipH8pHzids=";
+
+ 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/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
index 2f89521f93..a5f9ae2f94 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/third_party/nixpkgs/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
@@ -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/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index d00017f9a9..29416b6357 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
- version = "2023-02-05";
+ version = "2023-02-16";
pname = "oh-my-zsh";
- rev = "9b91e8256011240cbf65ba65fbe55c5fd9dbae07";
+ rev = "8a68bf67720a6a5442ae947d10d74b1dd3558d91";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "kdFfctEqRChVH5zRBL0yLQEwdUnmILBsuU10n2YWlu0=";
+ sha256 = "n6gfuvzz62l9AvQqWOwNjecLnHj4tsa5FDpunUeHZ/k=";
};
strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
index 46929315f0..6cc6271eed 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
@@ -736,6 +736,7 @@ rec {
pcre.out
gettext
binutils.bintools
+ binutils.bintools.lib
darwin.binutils
darwin.binutils.bintools
curl.out
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
index 9d99be2a02..4b0ca649ee 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
+++ b/third_party/nixpkgs/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;
@@ -322,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/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
index 08bd836e10..3d60934557 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
+++ b/third_party/nixpkgs/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
@@ -444,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; };
@@ -528,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/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
index b1b982ecdf..cbf2a2ceb8 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix
index 5c7dfcceec..8781907382 100644
--- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/stdenv/native/default.nix b/third_party/nixpkgs/pkgs/stdenv/native/default.nix
index 87862b84bc..bae4ff2c93 100644
--- a/third_party/nixpkgs/pkgs/stdenv/native/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix b/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix
index 7f25d7dbd2..3d72efae6c 100644
--- a/third_party/nixpkgs/pkgs/test/stdenv/hooks.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/X11/sunpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/sunpaper/default.nix
index 419aa04690..9f760bb4a9 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/sunpaper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix
index ddbcaf0518..f0aa3edd8a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/afterburn/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "afterburn";
- version = "5.4.0";
+ version = "5.4.1";
src = fetchFromGitHub {
owner = "coreos";
repo = "afterburn";
rev = "v${version}";
- sha256 = "sha256-Y9Z2PdQU7yHTlEXW+/C6v9k+5TkeQMagbC/gGG+JssQ=";
+ sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw=";
};
- cargoHash = "sha256-ZDyB/s2ig3aklEeB1JzNHat+roQniKrMcw4rvy9Z5pk=";
+ cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
index 33cb045a4a..8009118be6 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
@@ -25,14 +25,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
- version = "2.9.21"; # N.B: if you change this, check if overrides are still up-to-date
+ version = "2.9.23"; # 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-/CMV6eCNm2gF9HhdoTo2TUUy7I4NF9Fb+6l2biGIbkE=";
+ hash = "sha256-OaZ8Eax8XE4xGs5yHh+1P8mwEfHkFNEtY6ZGLQc8Thk=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index ed9d9007a9..433b424064 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.128.0";
+ version = "0.129.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-CKtDj9Ht81i8EcpjHqluWfwkEU15a/TZd6N+jCSzIc8=";
+ sha256 = "sha256-p9haEozDc1ZTGar89Clm7eEFFLJCYcw+gBN40Zg5vi8=";
};
- vendorHash = "sha256-aSXj21JNqX/cc62oFqyedmvczmudcV7RhLyWrKsdOMQ=";
+ vendorHash = "sha256-Vb0sgOOIQI0rTJDITFoMbXJcnN7BondbFTm3AF1JTLo=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix
index 72d293de21..e43e945455 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
index 9d7c35a73b..aab033b0ee 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix
index 3481baabe6..68a0936c7e 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix
@@ -14,21 +14,21 @@
buildGoModule rec {
pname = "pulumi";
- version = "3.54.0";
+ version = "3.55.0";
# Used in pulumi-language packages, which inherit this prop
- sdkVendorHash = "sha256-NstNzPKHlN8S+HSpYnG60ZtZtUQsh1Idr8Zz2Ef/jiw=";
+ sdkVendorHash = "sha256-ZE+df01jRx3nDiPGdlh1JNJn5NqsHW22fiUzeNlkzF8=";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-Rl0kh9NCliADfU9Nxc2SwnOIGDilYEeA0rcVCfal5N8=";
+ hash = "sha256-x5XebYFpxFi2QgrrK+wdMFOLiJLnRmar4gsply8F718=";
# Some tests rely on checkout directory name
name = "pulumi";
};
- vendorSha256 = "sha256-Bkmpw+ZneB1zHmaV4S29LFNoCjB2QmO5nR/iwQQQPpo=";
+ vendorSha256 = "sha256-8vchyD3MTi9Fxrd6SiywFK4tadyauvDxjs9RmoJuULA=";
sourceRoot = "${src.name}/pkg";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix
index 84c894a57f..3b35207e84 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
- version = "0.48.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/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
index d162774ed5..2d7f00d2d6 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
- version = "0.70.0";
+ version = "0.71.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- hash = "sha256-Dr0kVJk2LyyRFZq1fZBQSLb7z/AfCm8Y+tIMm8JmyJo=";
+ 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-UB0ltY4CYlsH4CyQZSOHDH8C9jSCL0TCri33H3oPH/0=";
+ vendorHash = "sha256-bUSQk4uJ4TAhjLS8pjqC486sa31z/MyZf5jDsnxhtSM=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
index e493398617..2c282514d3 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
index e68b565d05..ca0f9a961a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
@@ -5,17 +5,17 @@
buildGoModule rec {
pname = "trivy";
- version = "0.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/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
index ab018fde3d..2ade0f88a8 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
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/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix
index ab91cfc648..8232953725 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/zip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 4551d8b666..a83c1c81c4 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2023.02.07";
+ version = "2023.02.08";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- hash = "sha256-/EET65zdkHtVCNMurydskk1CO9pObCfWn7qVGGD9U3M=";
+ hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix
index 35685fd5fb..0c051047c0 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/mpris-scrobbler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix b/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix
index 72e5323f60..068f916e4e 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
index d943e43b76..d3c10804de 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index 2d764d2f7d..612f4ebf04 100644
--- a/third_party/nixpkgs/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
index dfac5af098..3d15cbd395 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix
index ca5670a2e5..e9d6f7c44d 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix
index 55ef5309d5..37a4519c94 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bzip3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix
index c556f31e69..d176b32d60 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix
index 6a489779cb..40df92b4d5 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix
index a620a07d47..b9bed9cc20 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index d9ec176220..e2677957e9 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix
index 5a917602c4..e1edac0c61 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
- version = "0.20.5";
+ version = "0.21.1";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
- sha256 = "sha256-8SizRNjA+lvp8ZD14SoRcymhYmJXlwoeZQjrekIbdL4=";
+ sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8=";
};
- cargoHash = "sha256-tXV1G0qWN0jLOKlnZfHHlOZw+wUItLzQtSg4o2f96u0=";
+ cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
index 39052ecba9..34a32c4a6d 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix
index 78bc6bd55c..ace05d0616 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix
deleted file mode 100644
index 2ee4f805fb..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/poetry.lock
deleted file mode 100644
index 4c588fc99e..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/pyproject.toml
deleted file mode 100644
index e3f1767b4c..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/update b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/update
deleted file mode 100755
index 77cfe9ff86..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/rnm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rnm/default.nix
new file mode 100644
index 0000000000..69ba0270ec
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
index d0a1e09163..bfe9f22747 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch
new file mode 100644
index 0000000000..e5755f1cb9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
index d31e466331..58ef6442d8 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix
index 7e0c30ebf1..0b16c74652 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix
index ad7fc339fe..203c58b8f6 100644
--- a/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/games/joystickwake/default.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-0rVVxaaAFHkmJeG3e181x7faTIeFwupplWepoyxc51g=";
};
- propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ];
+ propagatedBuildInputs = with python3.pkgs; [ dbus-next pyudev xlib ];
postInstall = ''
# autostart file
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
index 2b17fa796e..f060216935 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch
deleted file mode 100644
index 13e18fd044..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix
deleted file mode 100644
index ea5008dcf5..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/libyafaray/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/libyafaray/default.nix
index db48aa678c..22bbfddbcf 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/libyafaray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix
index a2adb7ee61..e63875c19c 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix
index aed3d485c4..d750d243fc 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix
index 14831c70b0..db44108112 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix
index a5581e7d6f..003a3c18bf 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix
index 745640bfa2..ce445ce6a0 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix
new file mode 100644
index 0000000000..faadff7365
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "boxxy";
+ version = "0.2.7";
+
+ src = fetchFromGitHub {
+ owner = "queer";
+ repo = "boxxy";
+ rev = "v${version}";
+ hash = "sha256-mvSarA0rZuOQvgf2NJXWIWoeZtvb+D/GofAHPKQDH6U=";
+ };
+
+ cargoHash = "sha256-Psc9qErqi3aangNowXxhkEXphFCR7pp+DKTKtk6tMo0=";
+
+ 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 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
index 257e75628e..4daab1ef99 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.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/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix
index 20c4221a08..d57475fb59 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index 84ed3aaa6f..93a6eea311 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix b/third_party/nixpkgs/pkgs/tools/misc/codevis/default.nix
new file mode 100644
index 0000000000..6ec698910c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix
index 04abea26ca..b9b5bfcc02 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
index 848a1c1dbb..410dede638 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
+++ b/third_party/nixpkgs/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.0";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-VKxCdejQGWLYeNOxa1PCwhdrLilnsYD9UBqj8Sen+OM=";
+ hash = "sha256-WoQ7mAtkv7By738bW1/oCurKEpHQKlqZkQ6D/b4zAes=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix
index 5ebbbe1e11..5850fada2a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ethtool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix
index 03be0c8b3b..806d1bc24b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix
index b522499d79..615cca2018 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
index 2c78a0a621..cefc80d3fe 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix
index fa6df2cebf..7b59dd92df 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
index eeca15dddd..dd550df598 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.15.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/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
index ca12c1f258..16db1cb2ef 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix
index 2d07932dab..e4efceea88 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix
index 051e98862b..3bde0466cd 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix
index 1eb1080c16..f44787924d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hoard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix
index f4629f4867..5bb1559af2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix
index e920a587fe..7f9a33927d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix
index c61398a78d..555f4a529b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/intermodal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix
index 65c88eac4e..c3a0c5aa90 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/license-generator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/license-generator/default.nix
index b880c66f97..5662b356f3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/license-generator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/lipl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lipl/default.nix
new file mode 100644
index 0000000000..b24fcaa3d2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix
index e245a05182..8fdee47bef 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix
index dc446d3f0a..46bf31ed66 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix
index 207de747d2..84c71bd85d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix
index bebe77faaa..40c060b631 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix
index 67ac3c0f40..e9448f84fd 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/pkgtop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pkgtop/default.nix
new file mode 100644
index 0000000000..1d2f0c048f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix
index 593ff2c68b..f51fcf254f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix
@@ -159,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/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
index f2a2adca4c..7bfa19a285 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix
index d0736761ba..05b008997b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
index 7ef202202c..6d9ff83d75 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "steampipe";
- version = "0.18.4";
+ version = "0.18.5";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
- sha256 = "sha256-sCnKnBxZuueH8XgXPqCLrJvS4zUbraz3mZr/2Xn+7YU=";
+ sha256 = "sha256-Y/Nn2jAkz135HxRNpeotoPRvyexG9QgtvIcTdXsj034=";
};
vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix
index 36c69bc498..bca16be194 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "tbls";
- version = "1.61.0";
+ version = "1.62.0";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
rev = "v${version}";
- hash = "sha256-yXD/LILWaXtjd3etdWINglZtvIYE6i6qmCSR3FUUQeM=";
+ hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU=";
};
vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix
index cdada5e469..90036a6b45 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix
index 25f6b385ac..f80642f1e8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix
index 5b6e6efff3..c3b5ae21f9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "vtm";
- version = "0.9.8r";
+ version = "0.9.8t";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${version}";
- sha256 = "sha256-1nCO8wtARnRCanIEH1XAJBjEnW18Bhm+pcr/EeiRrzY=";
+ sha256 = "sha256-Q6kwGmxDThsaGIzSPhxd/kKz0nORf6K9lUJMU9CdIXU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix
index 12c411f3ef..267272b0b6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix
index f55926d0ae..4ebaea963c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/yafetch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix
index 87808b4a22..5d8ab54b16 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
index 311e9e1b8c..b91e7733ab 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix
index b0f03c0932..5457cf4ab5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnscrypt-proxy2/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "dnscrypt-proxy2";
- version = "2.1.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/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
index 0b878a678e..f4d6dcdb99 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix
index 5fb8fc3399..a0ca8453ec 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix
index 8e641ec83e..5d0c92f2bf 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
index 4d6c54564b..030de9840f 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix
new file mode 100644
index 0000000000..b68ff100b7
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix
index c4c03cae3a..fabbbb40e7 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix
index 3763f2ce19..2702c740dd 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix
@@ -21,13 +21,13 @@
let
pname = "mozillavpn";
- version = "2.13.0";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = "mozilla-mobile";
repo = "mozilla-vpn-client";
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA=";
+ hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk=";
};
netfilter-go-modules = (buildGoModule {
@@ -40,19 +40,19 @@ let
inherit src;
name = "${pname}-${version}-extension-bridge";
preBuild = "cd extension/bridge";
- hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY=";
+ hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI=";
};
signatureDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}-signature";
preBuild = "cd signature";
- hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4=";
+ hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0=";
};
vpngleanDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}-vpnglean";
preBuild = "cd vpnglean";
- hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc=";
+ hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI=";
};
in
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix
index 713a4eef55..e3d51912c7 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/muffet/default.nix
new file mode 100644
index 0000000000..71c32ae7ad
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix
index 05804ab29c..425ddb4404 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ndn-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix
index c1becc886a..4301f606a4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
index f7e98b2b92..1ade86eb5d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix
index 8c8d0dd6a3..8d09977b4e 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/iodine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix
index 11a414a8a6..cef05f1161 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/l2tp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix
index 6b05dcdcd8..3e4fbb3651 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/sstp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix
index 146a2fc6ea..e35c8d71cc 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
index f9ad037d55..b7e1e879b0 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/pingu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pingu/default.nix
index 87b20daf97..ca33e48624 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/pingu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
index be50397bf1..4238391fda 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix
index 999d30bd92..908166bb15 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix
index 73ccdb43fe..9ccf68aa54 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
index 3d67bbb079..bf2587d8c6 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
index 4b283a5ecc..71e5dea12b 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/uqmi/default.nix b/third_party/nixpkgs/pkgs/tools/networking/uqmi/default.nix
index 17a55d86b9..067bc51854 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/uqmi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
index b0cca0985b..cad8c03227 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
index b0bc334652..6d19aea804 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff b/third_party/nixpkgs/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff
new file mode 100644
index 0000000000..b94ca03bb3
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix
new file mode 100644
index 0000000000..30c2eda8ed
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix
index e59715e61f..f250d6de13 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix
index 1320387a21..586e726b3d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/nix/info/default.nix b/third_party/nixpkgs/pkgs/tools/nix/info/default.nix
index 151a53f152..84bd3e8916 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/info/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
index 28c4425d8c..b3728645f7 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py
@@ -34,12 +34,14 @@ class DocBookRenderer(Renderer):
_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:
@@ -212,9 +214,25 @@ 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 ""
@@ -234,6 +252,14 @@ class DocBookRenderer(Renderer):
def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
env: MutableMapping[str, Any]) -> str:
return ''
+ 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
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py
index 24d0e8f3d6..1b796d9f04 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py
@@ -306,9 +306,15 @@ class ManpageRenderer(Renderer):
return f'\\fB{man_escape(page)}\\fP\\fR({man_escape(section)})\\fP'
else:
raise NotImplementedError("md node not supported yet", token)
- def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
+ 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 "" # mdoc knows no anchors
+ 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)
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
index 8c2d414575..ab61d699d7 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
@@ -76,10 +76,14 @@ class ManualDocBookRenderer(DocBookRenderer):
return f"\n{escape(token.content)}"
def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict,
env: MutableMapping[str, Any]) -> str:
+ # HACK for temporarily being able to replace md-to-db.sh. pandoc used this syntax to
+ # allow md files to inject arbitrary docbook, and manual chapters use it.
+ if token.info == '{=docbook}':
+ return token.content
info = f" language={quoteattr(token.info)}" if token.info != "" else ""
return f"\n{escape(token.content)}"
-class DocBookConverter(BaseConverter):
+class DocBookSectionConverter(BaseConverter):
__renderer__ = ManualDocBookRenderer
def finalize(self) -> str:
@@ -93,6 +97,29 @@ class DocBookConverter(BaseConverter):
return "\n".join(result)
+class ManualFragmentDocBookRenderer(ManualDocBookRenderer):
+ _tag: str = "chapter"
+
+ 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 token.tag == 'h1':
+ return (self._tag, attrs | { 'xmlns:xi': "http://www.w3.org/2001/XInclude" })
+ return (tag, attrs)
+
+class DocBookFragmentConverter(Converter):
+ __renderer__ = ManualFragmentDocBookRenderer
+
+ def convert(self, file: Path, tag: str) -> str:
+ assert isinstance(self._md.renderer, ManualFragmentDocBookRenderer)
+ try:
+ with open(file, 'r') as f:
+ self._md.renderer._title_seen = False
+ self._md.renderer._tag = tag
+ return self._render(f.read())
+ except Exception as e:
+ raise RuntimeError(f"failed to render manual {tag} {file}") from e
+
class Section:
@@ -124,27 +151,52 @@ class ChaptersAction(argparse.Action):
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:
+class SingleFileAction(argparse.Action):
+ def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace,
+ values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None:
+ assert isinstance(values, Sequence)
+ chapters = getattr(ns, self.dest) or []
+ chapters.append((Path(values[0]), Path(values[1])))
+ setattr(ns, self.dest, chapters)
+
+def _build_cli_db_section(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='+')
-def _run_cli_db(args: argparse.Namespace) -> None:
+def _build_cli_db_fragment(p: argparse.ArgumentParser) -> None:
+ p.add_argument('--manpage-urls', required=True)
+ p.add_argument("--chapter", action=SingleFileAction, required=True, nargs=2)
+ p.add_argument("--section", action=SingleFileAction, required=True, nargs=2)
+
+def _run_cli_db_section(args: argparse.Namespace) -> None:
with open(args.manpage_urls, 'r') as manpage_urls:
- md = DocBookConverter(json.load(manpage_urls))
+ md = DocBookSectionConverter(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())
+def _run_cli_db_fragment(args: argparse.Namespace) -> None:
+ with open(args.manpage_urls, 'r') as manpage_urls:
+ md = DocBookFragmentConverter(json.load(manpage_urls))
+ for kind in [ 'chapter', 'section' ]:
+ for (target, file) in getattr(args, kind):
+ converted = md.convert(file, kind)
+ target.parent.mkdir(parents=True, exist_ok=True)
+ target.write_text(converted)
+
def build_cli(p: argparse.ArgumentParser) -> None:
formats = p.add_subparsers(dest='format', required=True)
- _build_cli_db(formats.add_parser('docbook'))
+ _build_cli_db_section(formats.add_parser('docbook-section'))
+ _build_cli_db_fragment(formats.add_parser('docbook-fragment'))
def run_cli(args: argparse.Namespace) -> None:
- if args.format == 'docbook':
- _run_cli_db(args)
+ if args.format == 'docbook-section':
+ _run_cli_db_section(args)
+ elif args.format == 'docbook-fragment':
+ _run_cli_db_fragment(args)
else:
raise RuntimeError('format not hooked up', args)
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
index 5bc16e6593..599ee7e91c 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
@@ -1,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, cast, Iterable, 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,21 +66,24 @@ 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 = []
@@ -86,7 +94,7 @@ class Renderer(markdown_it.renderer.RendererProtocol):
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,
@@ -224,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,
@@ -239,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
@@ -247,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):
@@ -263,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:
@@ -321,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]
@@ -340,56 +471,21 @@ 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 = []
- end_stack = []
- for i in range(0, len(tokens)):
- if tokens[i].type in [ 'bullet_list_open', 'ordered_list_open' ]:
- wide_stack.append([i, True])
- end_stack.append([i, cast(int, tokens[i].attrs.get('start', 1))])
- elif tokens[i].type in [ 'bullet_list_close', 'ordered_list_close' ]:
- (idx, compact) = wide_stack.pop()
- tokens[idx].meta['compact'] = compact
- (idx, end) = end_stack.pop()
- if tokens[i].type == 'ordered_list_close':
- tokens[idx].meta['end'] = end - 1
- elif len(wide_stack) > 0 and tokens[i].type == 'paragraph_open' and not tokens[i].hidden:
- wide_stack[-1][1] = False
- elif tokens[i].type == 'list_item_open':
- end_stack[-1][1] += 1
-
- return tokens
-
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, env: Optional[MutableMapping[str, Any]] = None) -> str:
env = {} if env is None else env
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py
index 4efcb9bdfc..1d836a916d 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
index 2d028a0e63..5dc3859de5 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "2.25.0";
+ version = "2.25.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Mu0/mWkdrhaybI0iAB/MuD7UTbDDC73ZMxr8kU7R23I=";
+ sha256 = "sha256-J5vAvF22NKMvvaftfVugWYAP6uM6pcyKEPqRDf+J9A4=";
};
- vendorHash = "sha256-YDV816jTLAqbSjiKXvbkwPbPCLPplH+NFN1SCVjWcbk=";
+ vendorHash = "sha256-GaESwr7rvDvjQ7zi/LbndiB2lQGmIELTx7wAJitj5kw=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix
index 8771411262..246e7c9c98 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-index/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix
index d85e40bdc2..f0032916db 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/repro-get/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/repro-get/default.nix
new file mode 100644
index 0000000000..42b000658c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix
index 130c9a4255..11d08c0dfd 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix b/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix
index c25db9e2d3..7817329f06 100644
--- a/third_party/nixpkgs/pkgs/tools/security/aflplusplus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix b/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix
index 67c850eba4..2a7701ed9e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/age-plugin-yubikey/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/amber/default.nix b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix
index c2196cea68..2b64480c4a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix
index 3e4072c8ea..4895e3def1 100644
--- a/third_party/nixpkgs/pkgs/tools/security/asnmap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix b/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix
index 27cf191018..4c00f41919 100644
--- a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix
index edb10f384b..b897fe6187 100644
--- a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/enc/default.nix b/third_party/nixpkgs/pkgs/tools/security/enc/default.nix
new file mode 100644
index 0000000000..00d6d0211f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/erosmb/default.nix b/third_party/nixpkgs/pkgs/tools/security/erosmb/default.nix
index 90165b6581..b7984feac5 100644
--- a/third_party/nixpkgs/pkgs/tools/security/erosmb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix
index 658df4348a..3831ff4d8e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix
@@ -10,8 +10,8 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk=";
};
vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4=";
@@ -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/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix b/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix
index f86d807d43..438c22f004 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix
similarity index 87%
rename from third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix
rename to third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix
index 0f56c4a8c1..c1f2825e8e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gnupg/23.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/24.nix
@@ -12,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 ];
@@ -30,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
diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
index c4e910aa03..7f7a185347 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix
index 9e585e27dc..f0632291a9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gopass/hibp.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/hibp.nix
index c6db9a1d65..d28db3bca2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/hibp.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix
index f82b00fd20..7ce9c4cc87 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix
index dc9646ce91..abb8eb653c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/summon.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix
index 46d296453f..d7c158e6a0 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix
@@ -1,14 +1,19 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, gotrue-supabase
+}:
buildGoModule rec {
pname = "gotrue";
- version = "2.44.0";
+ version = "2.47.1";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
- hash = "sha256-LSA6h6hs5M80urBasVDWZSCNA3fWxjYjvbPRbHLOX0Y=";
+ hash = "sha256-GBrdYlWvtlz/A/5Tn58EPYBL3X73D44GzbN1OrzwU8U=";
};
vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo=";
@@ -16,12 +21,18 @@ buildGoModule rec {
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/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
index 486ee7ba65..8b003ea470 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
@@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
- hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8=";
+ hash = "sha256-2OMjqY1oTVKyEuCJrGGSQfgjQPSOQRx6LPhoFUuf/pw=";
};
- cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8=";
+ cargoHash = "sha256-EhnQvVXv08l4ONnuIudU0WBw5AptD7OcvPUNOdpRZj4=";
nativeBuildInputs = [
gpgme # for gpgme-config
diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix
index 7b26825b70..bcf55ea526 100644
--- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix
index 3378e0d332..6e5f934d86 100644
--- a/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "mitmproxy2swagger";
- version = "0.7.2";
+ version = "0.8.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "alufers";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA=";
+ hash = "sha256-HD+zYWQvmAqtJqG8I2Yib/UWCvUewGsXxTtd2E4GyJ0=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
index 579f793297..9e53429819 100644
--- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/opencryptoki/default.nix b/third_party/nixpkgs/pkgs/tools/security/opencryptoki/default.nix
index 140f032a5f..dcb1c0bb0c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/opencryptoki/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix
index f04ac1b1a4..6eb35099db 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix
index befc07e2e1..d3295de5ba 100644
--- a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix b/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix
index 15c0d662ce..96f0e44716 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sn0int/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix
index fdf9f2f047..06047a1925 100644
--- a/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix
index 3f4613b987..00dd9c00be 100644
--- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
index 42a4e1ccb7..5c2a2e9b0d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix
index 88f39e8a63..98ac2254fb 100644
--- a/third_party/nixpkgs/pkgs/tools/system/acpica-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix
index 829d249da5..d18225a93b 100644
--- a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix
index de4acffa63..0e746b0d07 100644
--- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix
index 305761e0c3..215818862c 100644
--- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix
index 2ef4d13c36..d9b1bc06b2 100644
--- a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix
index a84113fe20..5f24ddf626 100644
--- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix
index ebc552687c..5b45ddbb3a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index 0daaf6ee7e..44d0063414 100644
--- a/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch
index fa7a0e7ad9..a03593896d 100644
--- a/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/rex/default.nix b/third_party/nixpkgs/pkgs/tools/system/rex/default.nix
index 2bb6733312..cf59a22cec 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
index 47542d2537..d7e23a9acb 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/zps/default.nix b/third_party/nixpkgs/pkgs/tools/system/zps/default.nix
new file mode 100644
index 0000000000..f4003ed934
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/d2/default.nix b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix
index 53cb9b876f..27614de6b2 100644
--- a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/third_party/nixpkgs/pkgs/tools/text/dos2unix/default.nix
index 6a0c5fc57e..c6c92b876f 100644
--- a/third_party/nixpkgs/pkgs/tools/text/dos2unix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix b/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix
index 796aa0da8f..8912f3ac2c 100644
--- a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix b/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix
index 93cf684c19..ee78451aae 100644
--- a/third_party/nixpkgs/pkgs/tools/text/gpt2tc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/groff/default.nix b/third_party/nixpkgs/pkgs/tools/text/groff/default.nix
index a38251557c..215f7e7d25 100644
--- a/third_party/nixpkgs/pkgs/tools/text/groff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/justify/default.nix b/third_party/nixpkgs/pkgs/tools/text/justify/default.nix
index 1e18e22db8..86de736566 100644
--- a/third_party/nixpkgs/pkgs/tools/text/justify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/mawk/default.nix
index 62a23318ca..203a79fa38 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mawk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix
index c4fc19ef1a..7b7062a752 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix
index cba1e97591..29c6e54ee5 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mdbook-pdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-pdf/default.nix
index 020ebdc0ca..d94382524b 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-pdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix
index d3bf8b2d8b..9d00c8e1fd 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
index ebc7cdcf71..55c66f7a54 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/qgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/qgrep/default.nix
index 032e947412..4145ec656d 100644
--- a/third_party/nixpkgs/pkgs/tools/text/qgrep/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix
index 0802f7b983..0ddd7509c9 100644
--- a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/unoconv/default.nix b/third_party/nixpkgs/pkgs/tools/text/unoconv/default.nix
index 9f3375c7e4..50cd3d9411 100644
--- a/third_party/nixpkgs/pkgs/tools/text/unoconv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix
index cd1147ba4c..1bfdfadd03 100644
--- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix b/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix
index 9865c302f9..829ea2c66e 100644
--- a/third_party/nixpkgs/pkgs/tools/text/xidel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/mmark/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/mmark/default.nix
index 0513035094..a5b6778884 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/mmark/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/default.nix
index fbb6fdb0fe..e9017333c9 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
index 61150fa8b7..c02ca35296 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix
index 40e3bfd5c1..97c80ec560 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix
index d8d003b206..6bb451aa9e 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/multipass/default.nix
@@ -25,7 +25,7 @@
let
pname = "multipass";
- version = "1.11.0";
+ version = "1.11.1";
in
stdenv.mkDerivation {
inherit pname version;
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
owner = "canonical";
repo = "multipass";
rev = "refs/tags/v${version}";
- sha256 = "sha256-2d8piIIecoSI3BfOgAVlXl5P2UYDaNlxUgHXWbnSdkg=";
+ sha256 = "sha256-AIZs+NRAn/r9EjTx9InDZzS4ycni4MZQXmC0A5rpaJk=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix
index 319a9249f0..42f95735de 100644
--- a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index 818abd1e36..d091a2eecc 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -380,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
@@ -582,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
@@ -805,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
@@ -1271,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";
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 34235fd084..42b93a675d 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -368,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 { };
@@ -1033,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; };
@@ -1250,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 {
@@ -1910,7 +1913,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 {
@@ -2188,7 +2191,7 @@ with pkgs;
pcsxr = callPackage ../applications/emulators/pcsxr { };
- ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
+ ppsspp = callPackage ../applications/emulators/ppsspp { };
ppsspp-sdl = ppsspp;
@@ -2277,9 +2280,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 =
@@ -2548,7 +2549,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 { };
@@ -2857,6 +2858,8 @@ with pkgs;
boxes = callPackage ../tools/text/boxes { };
+ boxxy = callPackage ../tools/misc/boxxy { };
+
boundary = callPackage ../tools/networking/boundary { };
chamber = callPackage ../tools/admin/chamber { };
@@ -4406,7 +4409,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; };
};
@@ -4920,11 +4923,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 { };
@@ -5144,7 +5147,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
@@ -5400,8 +5405,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;
@@ -5661,6 +5667,8 @@ with pkgs;
sqlint = callPackage ../development/tools/sqlint { };
+ squawk = callPackage ../development/tools/squawk { };
+
antibody = callPackage ../shells/zsh/antibody { };
antigen = callPackage ../shells/zsh/antigen { };
@@ -6269,6 +6277,8 @@ with pkgs;
codebraid = callPackage ../tools/misc/codebraid { };
+ codevis = callPackage ../tools/misc/codevis { };
+
compass = callPackage ../development/tools/compass { };
cone = callPackage ../development/compilers/cone {
@@ -7035,6 +7045,8 @@ with pkgs;
boost = boost172;
};
+ enc = callPackage ../tools/security/enc { };
+
endlessh = callPackage ../servers/endlessh { };
endlessh-go = callPackage ../servers/endlessh-go { };
@@ -7726,6 +7738,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 { };
@@ -7743,11 +7757,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 { };
@@ -7934,6 +7948,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 { };
@@ -9510,6 +9526,8 @@ with pkgs;
linuxquota = callPackage ../tools/misc/linuxquota { };
+ lipl = callPackage ../tools/misc/lipl { };
+
liquidctl = with python3Packages; toPythonApplication liquidctl;
lmp = callPackage ../tools/security/lmp { };
@@ -9774,7 +9792,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 { };
@@ -9890,6 +9914,8 @@ with pkgs;
mubeng = callPackage ../tools/networking/mubeng { };
+ muffet = callPackage ../tools/networking/muffet { };
+
multipass = libsForQt5.callPackage ../tools/virtualization/multipass { };
multitime = callPackage ../tools/misc/multitime { };
@@ -10784,8 +10810,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 { };
@@ -10982,8 +11006,7 @@ with pkgs;
pocketbase = callPackage ../servers/pocketbase { };
- podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
- podman-unwrapped = callPackage ../applications/virtualization/podman { };
+ podman = callPackage ../applications/virtualization/podman { };
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
@@ -11196,6 +11219,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 {
@@ -11634,7 +11659,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 { };
@@ -12750,6 +12775,8 @@ with pkgs;
ipbt = callPackage ../tools/misc/ipbt { };
+ tuckr = callPackage ../applications/misc/tuckr { };
+
tuhi = callPackage ../applications/misc/tuhi { };
tuir = callPackage ../applications/misc/tuir { };
@@ -13082,8 +13109,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 {};
@@ -13735,6 +13761,8 @@ with pkgs;
zplug = callPackage ../shells/zsh/zplug { };
+ zps = callPackage ../tools/system/zps { };
+
zi = callPackage ../shells/zsh/zi {};
zinit = callPackage ../shells/zsh/zinit {} ;
@@ -13829,6 +13857,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;
});
@@ -14299,7 +14329,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}"};
@@ -14337,7 +14367,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
@@ -14989,14 +15020,11 @@ 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 { };
openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
@@ -15265,7 +15293,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;
@@ -15645,13 +15673,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 { };
@@ -15660,8 +15688,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;
@@ -15693,6 +15721,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;
};
@@ -15762,6 +15791,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;
@@ -16907,9 +16937,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 { };
@@ -16927,9 +16955,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;
@@ -17191,13 +17217,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 {
@@ -17529,6 +17551,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.
@@ -18075,6 +18098,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 {};
@@ -19273,7 +19300,7 @@ with pkgs;
cog = callPackage ../development/web/cog { };
- cosmoc = callPackage ../development/tools/cosmoc { };
+ cosmocc = callPackage ../development/tools/cosmocc { };
cosmopolitan = callPackage ../development/libraries/cosmopolitan { };
@@ -19446,12 +19473,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 {};
@@ -19526,6 +19556,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 { };
@@ -19542,30 +19576,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
@@ -19574,26 +19606,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 { };
@@ -19612,6 +19626,8 @@ with pkgs;
filtron = callPackage ../servers/filtron { };
+ fizz = callPackage ../development/libraries/fizz { };
+
flann = callPackage ../development/libraries/flann { };
flatcc = callPackage ../development/libraries/flatcc { };
@@ -19654,7 +19670,6 @@ with pkgs;
freeimage = callPackage ../development/libraries/freeimage {
inherit (darwin) autoSignDarwinBinariesHook;
- libraw = libraw_unstable;
};
freetts = callPackage ../development/libraries/freetts {
@@ -19707,6 +19722,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 { };
@@ -20457,6 +20474,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 {
@@ -20501,6 +20520,8 @@ with pkgs;
jbig2dec = callPackage ../development/libraries/jbig2dec { };
+ jbig2enc = callPackage ../development/libraries/jbig2enc { };
+
jcal = callPackage ../development/libraries/jcal { };
jbigkit = callPackage ../development/libraries/jbigkit { };
@@ -20509,6 +20530,8 @@ with pkgs;
jose = callPackage ../development/libraries/jose { };
+ jpcre2 = callPackage ../development/libraries/jpcre2 { };
+
jshon = callPackage ../development/tools/parsing/jshon { };
json2hcl = callPackage ../development/tools/json2hcl { };
@@ -20600,7 +20623,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 { };
@@ -20887,6 +20910,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 { };
@@ -22631,6 +22656,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 { };
@@ -22697,13 +22724,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 { };
@@ -23615,7 +23636,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 {
@@ -23667,6 +23691,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 { };
@@ -25182,6 +25208,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 { };
@@ -25773,8 +25801,6 @@ with pkgs;
gmailctl = callPackage ../applications/networking/gmailctl { };
- gometer = callPackage ../applications/misc/gometer { };
-
gomp = callPackage ../applications/version-management/gomp { };
gomplate = callPackage ../development/tools/gomplate { };
@@ -25818,7 +25844,7 @@ with pkgs;
};
btop = callPackage ../tools/system/btop {
- stdenv = gcc11Stdenv;
+ stdenv = gcc12Stdenv;
};
nmon = callPackage ../os-specific/linux/nmon { };
@@ -26087,7 +26113,6 @@ with pkgs;
};
libraw = callPackage ../development/libraries/libraw { };
- libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { };
libraw1394 = callPackage ../development/libraries/libraw1394 { };
@@ -26203,9 +26228,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
@@ -26421,7 +26446,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 { };
@@ -26597,7 +26622,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;
};
@@ -30292,7 +30317,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 { };
@@ -30398,6 +30423,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.
};
@@ -30867,7 +30902,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 { };
@@ -33363,6 +33398,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 { };
@@ -34787,6 +34824,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 { };
@@ -38798,6 +38837,8 @@ with pkgs;
undaemonize = callPackage ../tools/system/undaemonize {};
+ wtfis = callPackage ../tools/networking/wtfis { };
+
houdini = callPackage ../applications/misc/houdini {};
openfst = callPackage ../development/libraries/openfst {};
@@ -39093,6 +39134,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 { };
@@ -39108,4 +39151,6 @@ with pkgs;
resgate = callPackage ../servers/resgate { };
oversteer = callPackage ../applications/misc/oversteer { };
+
+ volantes-cursors = callPackage ../data/icons/volantes-cursors { };
}
diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
index b067f5cbbc..cf9bb6e593 100644
--- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
+++ b/third_party/nixpkgs/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
@@ -182,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/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 6fa30f0df8..f115511a11 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -26521,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 = {
diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
index 827985cab7..3f1aa277de 100644
--- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix
+++ b/third_party/nixpkgs/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.
@@ -84,7 +91,6 @@ lib.makeScope pkgs.newScope (self: with self; {
, zendExtension ? false
, doCheck ? true
, extName ? name
- , allowLocalNetworking ? false
, ...
}@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // {
pname = "php-${name}";
@@ -104,7 +110,6 @@ lib.makeScope pkgs.newScope (self: with self; {
];
inherit configureFlags internalDeps buildInputs zendExtension doCheck;
- __darwinAllowLocalNetworking = allowLocalNetworking;
preConfigurePhases = [
"cdToExtensionRootPhase"
@@ -413,8 +418,17 @@ lib.makeScope pkgs.newScope (self: with self; {
valgrind.dev
];
zendExtension = true;
+ 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.
- allowLocalNetworking = true;
+ __darwinAllowLocalNetworking = true;
}
{
name = "openssl";
diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
index 61ed9098b9..758986390b 100644
--- a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -445,6 +445,11 @@
"openssl"
]
},
+ "libcurl": {
+ "attrPath": [
+ "curl"
+ ]
+ },
"libecpg": {
"attrPath": [
"postgresql"
diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
index 04da6d141e..adf13052e9 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
@@ -102,6 +102,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
@@ -156,6 +157,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/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index cf7d7643e0..8272597e28 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -853,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 { };
@@ -1477,7 +1479,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 { };
@@ -2461,6 +2463,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 { };
@@ -2473,6 +2477,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 { };
@@ -4059,6 +4065,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 { };
@@ -4236,8 +4244,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 { };
@@ -4332,6 +4338,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 { };
@@ -5454,8 +5464,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 { };
@@ -6188,6 +6196,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 { };
@@ -7182,6 +7192,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 { };
@@ -7258,6 +7273,8 @@ self: super: with self; {
pyorthanc = callPackage ../development/python-modules/pyorthanc { };
+ pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { };
+
pyoverkiz = callPackage ../development/python-modules/pyoverkiz { };
pyownet = callPackage ../development/python-modules/pyownet { };
@@ -8050,8 +8067,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 { };
@@ -8300,14 +8315,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 { };
@@ -8958,6 +8969,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 { };
@@ -9842,6 +9855,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;
};
@@ -9932,6 +9947,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 { };
@@ -11886,6 +11903,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 { };
diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
index 83a90a2a5e..a79dc31ed9 100644
--- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix
index f8139b7dab..6366b2f2be 100644
--- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix
index ee7e64f1ff..8c38800b77 100644
--- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/release-python.nix b/third_party/nixpkgs/pkgs/top-level/release-python.nix
index f341857222..691f50708a 100644
--- a/third_party/nixpkgs/pkgs/top-level/release-python.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
index d1bf5cf7b6..3bdb15e9d7 100644
--- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1271f7nyrmb0kk93zjsb3zyxng8jlzhhg9784pwfpwvrlclashlw";
+ sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
type = "gem";
};
- version = "6.0.6";
+ version = "6.1.7.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "091qjiv0mvmn5k9krqkv1lfg8983mgcmrf11gxa6xkchh74csr6a";
+ sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
type = "gem";
};
- version = "6.0.6";
+ version = "6.1.7.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z";
+ sha256 = "017jh2lx3z5hqjvnqclc5bfr5q0d3zk0nqjfz73909ybr4h20kmi";
type = "gem";
};
- version = "0.2.0";
+ version = "0.2.1";
};
builder = {
groups = ["default"];
@@ -193,10 +193,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
+ sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq";
type = "gem";
};
- version = "3.0.5";
+ version = "3.0.6";
};
charlock_holmes = {
groups = ["default"];
@@ -360,10 +360,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fxrq0b1x5gr2gr9md6mkwgaj8519gf1sbyqs88yqphbigf5iy75";
+ sha256 = "0csgcp2kkmciavnic1yrb8z405dg4lqkzdlw2zscahvggpwr0j2p";
type = "gem";
};
- version = "0.1.1";
+ version = "0.2.0";
};
cocoapods-downloader = {
groups = ["default"];
@@ -401,10 +401,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vpn0y2r91cv9kr2kh6rwh51ipi90iyjfya8ir9grxh1ngv179ck";
+ sha256 = "06rvrsb5p4j9pwqg7xzx8kv0v4x3wwjbiw6y2i905qhyqxqrww2l";
type = "gem";
};
- version = "2.2.2";
+ version = "2.2.4";
};
cocoapods-git_url_rewriter = {
groups = ["default"];
@@ -417,15 +417,15 @@
version = "1.0.1";
};
cocoapods-keys = {
- dependencies = ["dotenv" "osx_keychain"];
+ dependencies = ["dotenv" "ruby-keychain"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "153cxxsi77dygc4qrij6qs44dbvc7dw31jx06cmf0ajrhv9qjnxl";
+ sha256 = "1zycjq1i3kqzpixngm1jp66r075yrb54qcd0xxxa8rmxngimqhff";
type = "gem";
};
- version = "2.2.1";
+ version = "2.3.1";
};
cocoapods-open = {
groups = ["default"];
@@ -587,20 +587,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8";
+ sha256 = "1q4ai2i4rswhq5l46ny5066z8pavj3j0qvr9hbgqvzj677fa335f";
type = "gem";
};
- version = "0.23.6";
+ version = "0.23.8";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+ sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
type = "gem";
};
- version = "1.1.10";
+ version = "1.2.0";
};
connection_pool = {
groups = ["default"];
@@ -627,10 +627,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1195gisqv1kn4lpshn6frlnjgx5r9a0gnpkzjxzsi6wfmfys1mwy";
+ sha256 = "1lgga9ina9gnpp9ycj8lpqkc5hm5qlxb41s4pfg0w6fnnpgmairc";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.5";
};
curses = {
groups = ["default"];
@@ -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 = [];
@@ -699,10 +709,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kqfwfz3pf6mb22r48ybbp7hkzy2qafdpp1bv1knjd74zyilv73h";
+ sha256 = "0qbj8lvl8lzrbpfj9612iiwxf53drb8jg1l4bd1mcqyds8lw9z9z";
type = "gem";
};
- version = "7.4.0";
+ version = "7.5.0";
};
dnsruby = {
dependencies = ["simpleidn"];
@@ -783,10 +793,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
+ sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
type = "gem";
};
- version = "1.11.0";
+ version = "1.12.0";
};
escape = {
groups = ["default"];
@@ -804,10 +814,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
+ sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v";
type = "gem";
};
- version = "0.15.0";
+ version = "0.16.0";
};
eventmachine = {
groups = ["default"];
@@ -824,10 +834,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx";
+ sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
- version = "0.93.1";
+ version = "0.99.0";
};
execjs = {
groups = ["default"];
@@ -845,20 +855,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv";
+ sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.4";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq";
+ sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8";
type = "gem";
};
- version = "3.0.1";
+ version = "3.0.2";
};
ffi = {
groups = ["default"];
@@ -1013,10 +1023,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "sha256-bkSvvD2SClHJ5FyERpyqZaWp0im7NNhn+wplbmnZD84=";
+ sha256 = "0llbqaziga5vawfs71r1ijfiw9allsd15wsrm5vr0sqd3yn7ak89";
type = "gem";
};
- version = "1.13.1";
+ version = "1.13.2";
};
github-pages = {
dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"];
@@ -1024,10 +1034,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kg03q6hvz191pyqhbhz3qis5niy3qvrxsnd3sdxcqz6a750wmw6";
+ sha256 = "0brk2sgk01mly2hb1h5hm3ip1l6hjr4xx9zkqfhs5k3swlwnwzq9";
type = "gem";
};
- version = "227";
+ version = "228";
};
github-pages-health-check = {
dependencies = ["addressable" "dnsruby" "octokit" "public_suffix" "typhoeus"];
@@ -1045,10 +1055,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
+ sha256 = "1m3ypny84jyvlxf060p3q3d8pb4yihxa2br5hh012bgc11d09nky";
type = "gem";
};
- version = "1.8.1";
+ version = "1.9.0";
};
glib2 = {
dependencies = ["native-package-installer" "pkg-config"];
@@ -1078,10 +1088,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw";
+ sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw";
type = "gem";
};
- version = "2.0.20";
+ version = "2.0.22";
};
gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"];
@@ -1100,10 +1110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03qiz6kbk260v3613z4wrk8iy1mi06j631fglcskfxyhf18lpy05";
+ sha256 = "1vcr5wcvfbsq91302playk3i98wdisspkybcmajl04agv4k8xr68";
type = "gem";
};
- version = "6.0.8";
+ version = "6.1.1";
};
hashie = {
groups = ["default"];
@@ -1120,10 +1130,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+ sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn";
type = "gem";
};
- version = "2.0.3";
+ version = "2.1.0";
};
hike = {
groups = ["default"];
@@ -1234,10 +1244,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
- version = "0.9.5";
+ version = "1.12.0";
};
iconv = {
groups = ["default"];
@@ -1254,20 +1264,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm";
+ sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih";
type = "gem";
};
- version = "0.1.4";
+ version = "0.1.5";
};
ipaddr = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq";
+ sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf";
type = "gem";
};
- version = "1.2.4";
+ version = "1.2.5";
};
jaro_winkler = {
groups = ["default"];
@@ -1296,10 +1306,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wzb3ysr43f9acpdfhnndnqh1ypir01w4s4clzi38l9mxkfc4d75";
+ sha256 = "0m9yzkiwm751wbyq3aq1355afcx240r24nrick1fzv578bis4kyy";
type = "gem";
};
- version = "3.9.2";
+ version = "3.9.3";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -1340,10 +1350,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xkqq0cyca84hxs47ilkg3sjavwjvc6wijz4n0zd4nxj01jz54bh";
+ sha256 = "1zps7bb9kc4qf32b9y9h47z08wpsziklg0jnhcrcz2wxn09fijgd";
type = "gem";
};
- version = "0.2.0";
+ version = "0.4.0";
};
jekyll-default-layout = {
dependencies = ["jekyll"];
@@ -1722,40 +1732,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
+ sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
type = "gem";
};
- version = "1.6.1";
+ version = "1.6.2";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
+ sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem";
};
- version = "2.6.2";
+ version = "2.6.3";
};
json_pure = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04d8lc6mc09bqmcrlygh51an8r0j7l3p9aghjkc1g6i4fvmrmxfc";
+ sha256 = "0kn736pb52j8b9xxq6l8wqp2chs74aa14vfnp0rijjn086m8b4f3";
type = "gem";
};
- version = "2.6.2";
+ version = "2.6.3";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq";
+ sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem";
};
- version = "2.5.0";
+ version = "2.7.0";
};
kramdown = {
dependencies = ["rexml"];
@@ -1805,10 +1815,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jbqw7hkx08i5dj74fwfdc16980hsj3mhrxp4mmjxsdzw1kndrvp";
+ sha256 = "1xz5mrp103i95r4wfxny1f5x7h7vgnxv2p9cdkmmdjzrsk23rijs";
type = "gem";
};
- version = "3.2.4";
+ version = "4.0.0";
};
link_header = {
groups = ["default"];
@@ -1825,10 +1835,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
+ sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg";
type = "gem";
};
- version = "4.0.3";
+ version = "4.0.4";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@@ -1836,10 +1846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
+ sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -1847,7 +1857,7 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "sha256-bGRp797+NJYBAACjRvnTv3EOEaxGYeNTz1aFIyb7ECM=";
+ sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
type = "gem";
};
version = "2.19.1";
@@ -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"];
@@ -1940,20 +1961,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
+ sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
type = "gem";
};
- version = "4.11.0";
+ version = "4.12.0";
+ };
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
+ type = "gem";
+ };
+ version = "1.1.2";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
+ sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
type = "gem";
};
- version = "2.8.0";
+ version = "2.8.1";
};
minima = {
dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"];
@@ -1971,10 +2002,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
+ sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
type = "gem";
};
- version = "5.16.3";
+ version = "5.17.0";
};
molinillo = {
groups = ["default"];
@@ -2032,10 +2063,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1";
+ sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn";
type = "gem";
};
- version = "0.5.4";
+ version = "0.5.5";
};
nanaimo = {
groups = ["default"];
@@ -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 = [];
@@ -2124,10 +2199,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "sha256-0+4A8mwVF2PaFpHH/Ghx3dA+Uy90+FEB9aztwtCZ6Vg=";
+ sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
type = "gem";
};
- version = "1.13.10";
+ version = "1.14.1";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@@ -2140,16 +2215,27 @@
};
version = "4.25.1";
};
+ og-corefoundation = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xmz13rb92xy55askn5f3kkmz14qwyyhkdsikk2gd1ydicnaqkh8";
+ type = "gem";
+ };
+ version = "0.2.3";
+ };
openssl = {
dependencies = ["ipaddr"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk";
+ sha256 = "0rm9nzz2p204dgcplq9v53jr62m74w63vz01rk8dfmcgifkxhnff";
type = "gem";
};
- version = "2.2.2";
+ version = "2.2.3";
};
optimist = {
groups = ["default"];
@@ -2172,17 +2258,6 @@
};
version = "1.0.1";
};
- osx_keychain = {
- dependencies = ["RubyInline"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10hr3lihq7s5fv18dp0g4mfncvapkcwcd6xnn5483ximyd7rhfx0";
- type = "gem";
- };
- version = "1.0.2";
- };
ovirt-engine-sdk = {
dependencies = ["json"];
groups = ["default"];
@@ -2200,10 +2275,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zk3fwwx8zzxhmfmlgzzr050jzsl58ma54wy99xy4xx0ibmw48pv";
+ sha256 = "1hi3jcm9s7hkv35gzgdh3nxs0s9h7kkqwv1x6kalww15msk60fxd";
type = "gem";
};
- version = "1.0.4";
+ version = "1.1.0";
};
pango = {
dependencies = ["cairo-gobject" "gobject-introspection"];
@@ -2232,20 +2307,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p";
+ sha256 = "0cdjcasyg7w05kk82dqysq29f1qcf8y5sw8iak5flpxjbdil50qv";
type = "gem";
};
- version = "3.1.2.1";
+ version = "3.2.1.0";
};
paru = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v6my9g7bwjlx92hr9w0blnrcrai1yg3yz6k9xz0i6mq8lml2k87";
+ sha256 = "0mzy0s4cdqm5nvgyj55idc2pv51k3zlgw6sa7825dcyrk2ihcx0c";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
pastel = {
dependencies = ["tty-color"];
@@ -2294,20 +2369,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3";
+ sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
type = "gem";
};
- version = "1.4.4";
+ version = "1.4.5";
};
pkg-config = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl";
+ sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651";
type = "gem";
};
- version = "1.4.9";
+ version = "1.5.1";
};
polyglot = {
groups = ["default"];
@@ -2335,10 +2410,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l5pk6w63bj7cxy4y9mqvpclw6r0pcm7xa44c33vx3f960px8wk8";
+ sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk";
type = "gem";
};
- version = "1.0.2";
+ version = "1.2.0";
};
pry = {
dependencies = ["coderay" "method_source"];
@@ -2346,10 +2421,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr";
+ sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
type = "gem";
};
- version = "0.14.1";
+ version = "0.14.2";
};
pry-byebug = {
dependencies = ["byebug" "pry"];
@@ -2368,10 +2443,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wyvql6pb6m8jl8bsamabxhxhd86bnqblspaxzz05sl0fm2ynj0r";
+ sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.0";
};
public_suffix = {
groups = ["default"];
@@ -2389,30 +2464,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra";
+ sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k";
type = "gem";
};
- version = "6.0.0";
+ version = "6.1.0";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
+ sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.2";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
+ sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
type = "gem";
};
- version = "2.2.4";
+ version = "2.2.6.2";
};
rack-protection = {
dependencies = ["rack"];
@@ -2420,10 +2495,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk";
+ sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.5";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -2442,10 +2517,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "sha256-iV0Mh6K2YjiR6FwdUHx/FqzaTnfZRpL1N981unE5i9U=";
+ sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
type = "gem";
};
- version = "1.4.4";
+ version = "1.5.0";
};
rainbow = {
groups = ["default"];
@@ -2514,10 +2589,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wd4j2irk88qcrxbhhbrsr6rswz8ckva7n0hsjyffnmx1ya60n8y";
+ sha256 = "0dgj5n7rj83981fvrhswfwsh88x42p7r00nvd80hkxmdcjvda2h6";
type = "gem";
};
- version = "2.7.0";
+ version = "2.8.4";
};
rchardet = {
groups = ["default"];
@@ -2555,10 +2630,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
+ sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca";
type = "gem";
};
- version = "3.5.1";
+ version = "3.6.0";
};
redis = {
dependencies = ["redis-client"];
@@ -2566,10 +2641,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s2hvsq0nyxmh27cqv00zk0s6bb4dlxfhzng5x0w8qijpw0vx9h5";
+ sha256 = "10r5z5mg1x5kjx3wvwx5d8bqgd2j8pc4dlaasq7nmnl3nsn7sn9k";
type = "gem";
};
- version = "5.0.5";
+ version = "5.0.6";
};
redis-client = {
dependencies = ["connection_pool"];
@@ -2577,10 +2652,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hkwqi18cbiil787ivvh2s8i6csrn0z3qb4ccp2vhrc2w6ay6ncq";
+ sha256 = "1q9h6mgr3nnxlc65r3f78cn208i4l8y2jqa1g6wwjl620za3ay9q";
type = "gem";
};
- version = "0.10.0";
+ version = "0.12.1";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
@@ -2609,10 +2684,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi";
+ sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.0";
};
rest-client = {
dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
@@ -2647,14 +2722,15 @@
version = "3.2.5";
};
rmagick = {
+ dependencies = ["pkg-config"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v269bx6bhnrlxpsmhr8xjv64dwnnykiw9hr58dwghsps1qb8ib7";
+ sha256 = "11skr2l49cml2wgm74zzcxwdyw0vn0abynhhq1m08jpzr309x730";
type = "gem";
};
- version = "5.0.0";
+ version = "5.1.0";
};
rouge = {
groups = ["default"];
@@ -2693,10 +2769,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
+ sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
type = "gem";
};
- version = "3.12.0";
+ version = "3.12.1";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2704,10 +2780,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v";
+ sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
type = "gem";
};
- version = "3.12.0";
+ version = "3.12.2";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2715,10 +2791,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv";
+ sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
type = "gem";
};
- version = "3.12.0";
+ version = "3.12.3";
};
rspec-support = {
groups = ["default"];
@@ -2736,10 +2812,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1";
+ sha256 = "1jsiy93y5c2sx2sr5jmdah208idw038m2fpihgan4klmldm3r1pm";
type = "gem";
};
- version = "1.37.1";
+ version = "1.45.1";
};
rubocop-ast = {
dependencies = ["parser"];
@@ -2747,10 +2823,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy";
+ sha256 = "1zqk8dgjjhm0zll2rxqvvb8fl5vin7mmbc1ndn1a2q4276ri6ydc";
type = "gem";
};
- version = "1.23.0";
+ version = "1.26.0";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@@ -2758,10 +2834,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c";
+ sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc";
type = "gem";
};
- version = "1.15.0";
+ version = "1.16.0";
};
ruby-graphviz = {
dependencies = ["rexml"];
@@ -2774,6 +2850,17 @@
};
version = "1.2.5";
};
+ ruby-keychain = {
+ dependencies = ["ffi" "og-corefoundation"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g57fr1r39bfh1r887hp87mawfg3miidagvpqyqq3l0152ya43wr";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
ruby-libvirt = {
groups = ["default"];
platforms = [];
@@ -2845,17 +2932,6 @@
};
version = "0.0.5";
};
- RubyInline = {
- dependencies = ["ZenTest"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zq24qvkqzjsrcwyz9lp3pm602kqw08cp3g1acf3zy0nc7npvx9p";
- type = "gem";
- };
- version = "3.12.6";
- };
rubyzip = {
groups = ["default"];
platforms = [];
@@ -2871,10 +2947,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x";
+ sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58";
type = "gem";
};
- version = "1.5.0.1";
+ version = "1.5.1";
};
safe_yaml = {
groups = ["default"];
@@ -2946,20 +3022,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yzv7gn539aqwpada2mvfrnbdygr3d61ryp68ncp3kpx6nbz1x25";
+ sha256 = "1ffbd7jimj73fwdg7gf26bfc41a06aqi7zrwj90pkkwxipjljrzl";
type = "gem";
};
- version = "0.16.0";
+ version = "0.17.0";
};
sequel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qg80fqxs1rabsg3xrkfkkicnn1z2p02xsb1lxv78a6iw5p17d73";
+ sha256 = "1yf5sqw15gj5vmrbklw144y0wg8r92fwczfg64znwn61k9bz9j21";
type = "gem";
};
- version = "5.61.0";
+ version = "5.65.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@@ -2967,10 +3043,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15ndf1wr45vyqiyc3059f8zv0wp11i6xqfqclsa0v3qf739jb1zw";
+ sha256 = "01j51vn47ynyhlxpgz6wj8swm3d8g1hrad1678s0sd43kh2hqxdg";
type = "gem";
};
- version = "1.17.0";
+ version = "1.17.1";
};
simplecov = {
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
@@ -2978,10 +3054,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"];
@@ -3020,10 +3096,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz";
+ sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20";
type = "gem";
};
- version = "3.0.2";
+ version = "3.0.5";
};
slather = {
dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"];
@@ -3031,10 +3107,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wy8ws5n2gvxgkncbhrp4vkwjcbphcczw4k7y3g2wfl8fdmv5b4n";
+ sha256 = "0kdigir21jinkkj4q3cjsswix26lmff1rmnwjz2ywc6y9d8ib9ak";
type = "gem";
};
- version = "2.7.2";
+ version = "2.7.4";
};
slop = {
groups = ["default"];
@@ -3072,10 +3148,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7";
+ sha256 = "1pdy2f5phffknx98j2f5k72s52ayp456m3jkg08vx396yg59l0gi";
type = "gem";
};
- version = "0.47.2";
+ version = "0.48.0";
};
sqlite3 = {
dependencies = ["mini_portile2"];
@@ -3083,10 +3159,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6";
+ sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x";
type = "gem";
};
- version = "1.5.3";
+ version = "1.6.0";
};
string_inflection = {
groups = ["default"];
@@ -3104,10 +3180,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1im3kskcrmwa12q4pxilps7dyf9jlc82saasp6lkn5q7zqi7ilfh";
+ sha256 = "0zkq75hcqnxnipvccsd2f7vqcra6rplzvn1ds73sna6lcy8s6sxa";
type = "gem";
};
- version = "4.3.0";
+ version = "6.0.0";
};
syntax_tree-haml = {
dependencies = ["haml" "prettier_print" "syntax_tree"];
@@ -3115,10 +3191,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n2ag309fzz9qvj634aibv2khfc45vvsg1sra227ssn3xwcvx4vq";
+ sha256 = "0nnq6z8xhvcv3yc7rf64np3f8dx6j8gmvbi6ws3lwccq4w5cmqnk";
type = "gem";
};
- version = "2.0.0";
+ version = "3.0.0";
};
syntax_tree-rbs = {
dependencies = ["prettier_print" "rbs" "syntax_tree"];
@@ -3136,31 +3212,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zf6cavsmj87lszy0b5mzw6mdg0dbsb7f52xy2fx06y9abv78xxw";
+ sha256 = "0yvchq3j0splz70796a27hr1v6ifhyab5ddc9fl1x734nhmsy4rb";
type = "gem";
};
- version = "1.1.2";
+ version = "1.1.3";
};
temple = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kzp8c08jl137v62rafmr81b7hg01q3d1q70fr5y5cmmranfpml1";
+ sha256 = "07k5wr2ypsmsbyc9d1plhdki4xr7vvggld8r1i49iljkrpx5nbqc";
type = "gem";
};
- version = "0.9.1";
+ version = "0.10.0";
};
terminal-table = {
- dependencies = ["unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a";
type = "gem";
};
- version = "1.8.0";
+ version = "1.6.0";
};
thor = {
groups = ["default"];
@@ -3172,16 +3247,6 @@
};
version = "1.2.1";
};
- thread_safe = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
- type = "gem";
- };
- version = "0.3.6";
- };
thrift = {
groups = ["default"];
platforms = [];
@@ -3202,6 +3267,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 = [];
@@ -3218,10 +3293,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh";
+ sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
type = "gem";
};
- version = "1.6.11";
+ version = "1.6.12";
};
tty-color = {
groups = ["default"];
@@ -3266,15 +3341,15 @@
version = "1.4.0";
};
tzinfo = {
- dependencies = ["thread_safe"];
+ dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6";
+ sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
- version = "1.2.10";
+ version = "2.0.6";
};
uglifier = {
dependencies = ["execjs"];
@@ -3313,10 +3388,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+ sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
type = "gem";
};
- version = "1.8.0";
+ version = "2.4.2";
};
uuid4r = {
groups = ["default"];
@@ -3397,29 +3472,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18hihq3hxs2ywxh3ixm366cawwy4k733mh680ldaa1vxjiraxj58";
+ sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
type = "gem";
};
- version = "2.6.1";
- };
- ZenTest = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vss0ldskqprnlvl5pczcl8p346p2ib1sc6hyprbprh6gjq4v16y";
- type = "gem";
- };
- version = "4.12.1";
+ version = "2.6.7";
};
zookeeper = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gbmc76cxi4nlhrdch8ykinyzp5f2m6d272g8xhn5rjg3fjp15l1";
+ sha256 = "1hc87pbmgc53lksa1aql61kxn9d2kjzmlhnjxa5rcn01qhm3pkvg";
type = "gem";
};
- version = "1.5.3";
+ version = "1.5.5";
};
}